From 6f3c39207155e30b5fda3e2b7c9fa3e84e10dede Mon Sep 17 00:00:00 2001
From: Adrian Czarnecki <adrian.czarnecki@ts.fujitsu.com>
Date: Thu, 9 Nov 2017 07:57:01 +0100
Subject: [PATCH] Remove legacy job for monasca
Change-Id: Ic3e1641d699c61c786f31a9ac0c679314bb1e811
Depends-On: Ia2b3033659983357b6c0139c79ec26d35db07b66
---
.../post.yaml | 15 ----
.../run.yaml | 73 -------------------
zuul.d/zuul-legacy-jobs.yaml | 10 ---
3 files changed, 98 deletions(-)
delete mode 100644 playbooks/legacy/tempest-dsvm-monasca-pipeline-events/post.yaml
delete mode 100644 playbooks/legacy/tempest-dsvm-monasca-pipeline-events/run.yaml
diff --git a/playbooks/legacy/tempest-dsvm-monasca-pipeline-events/post.yaml b/playbooks/legacy/tempest-dsvm-monasca-pipeline-events/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-pipeline-events/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- hosts: primary
- tasks:
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/logs/**
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
diff --git a/playbooks/legacy/tempest-dsvm-monasca-pipeline-events/run.yaml b/playbooks/legacy/tempest-dsvm-monasca-pipeline-events/run.yaml
deleted file mode 100644
index 222704ac..00000000
--- a/playbooks/legacy/tempest-dsvm-monasca-pipeline-events/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-tempest-dsvm-monasca-pipeline-events from old job
- gate-tempest-dsvm-monasca-pipeline-events-ubuntu-xenial-nv
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- set -e
- set -x
- cat > clonemap.yaml << EOF
- clonemap:
- - name: openstack-infra/devstack-gate
- dest: devstack-gate
- EOF
- /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
- git://git.openstack.org \
- openstack-infra/devstack-gate
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- export PYTHONUNBUFFERED=true
- export DEVSTACK_GATE_NEUTRON=0
- export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest,dstat
-
- devstack_plugin=''
- if [ events == 'logs' ]; then
- devstack_plugin='log-api'
- export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-log-api git://git.openstack.org/openstack/monasca-log-api"
- elif [ events == 'events' ]; then
- devstack_plugin='events-api'
- export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-events-api git://git.openstack.org/openstack/monasca-events-api"
- else
- echo "Unknown pipeline events"
- exit 1
- fi
-
- pre_test_hook_script=$BASE/new/monasca-$devstack_plugin/devstack/pre_test_hook.sh
- post_test_hook_script=$BASE/new/monasca-$devstack_plugin/devstack/post_test_hook.sh
- devstack_rc_script=/opt/stack/new/monasca-$devstack_plugin/devstack/devstackgaterc
-
- if [ -f $pre_test_hook_script ]; then
- function pre_test_hook {
- source $pre_test_hook_script
- }
- export -f pre_test_hook
- fi
-
- if [ -f $post_test_hook_script ]; then
- function post_test_hook {
- source $post_test_hook_script
- }
- export -f post_test_hook
- fi
-
- if [ -f $devstack_rc_script ]; then
- export DEVSTACK_GATE_SETTINGS=$devstack_rc_script
- fi
-
- cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
- ./safe-devstack-vm-gate-wrap.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index 5c161021..02c10a25 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -6887,16 +6887,6 @@
- openstack/nova-lxd
- openstack/tempest
-- job:
- name: legacy-tempest-dsvm-monasca-pipeline-events
- parent: legacy-dsvm-base
- run: playbooks/legacy/tempest-dsvm-monasca-pipeline-events/run.yaml
- post-run: playbooks/legacy/tempest-dsvm-monasca-pipeline-events/post.yaml
- timeout: 7800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/tempest
-
- job:
name: legacy-tempest-dsvm-monasca-transform-python-functional
parent: legacy-dsvm-base