From 64988b211db70dfbf8ff00069bdbfac28a86cce1 Mon Sep 17 00:00:00 2001
From: yong sheng gong <gong.yongsheng@99cloud.net>
Date: Thu, 26 Oct 2017 18:02:42 +0800
Subject: [PATCH] Remove tacker legacy job
Depends-On: I549ce3d4f1f77435a3e7f23d5a92cea70340802b
Change-Id: Ife143804d3d994f6af06097bda9d0e56d2e62f24
---
.../legacy/tacker-dsvm-functional/post.yaml | 80 ------------------
.../legacy/tacker-dsvm-functional/run.yaml | 81 -------------------
zuul.d/zuul-legacy-jobs.yaml | 21 -----
3 files changed, 182 deletions(-)
delete mode 100644 playbooks/legacy/tacker-dsvm-functional/post.yaml
delete mode 100644 playbooks/legacy/tacker-dsvm-functional/run.yaml
diff --git a/playbooks/legacy/tacker-dsvm-functional/post.yaml b/playbooks/legacy/tacker-dsvm-functional/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/tacker-dsvm-functional/post.yaml
+++ /dev/null
@@ -1,80 +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=**/*nose_results.html
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - 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=**/*testr_results.html.gz
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - 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=/.testrepository/tmp*
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - 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=**/*testrepository.subunit.gz
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
- synchronize:
- src: '{{ ansible_user_dir }}/workspace/'
- dest: '{{ zuul.executor.log_root }}/tox'
- mode: pull
- copy_links: true
- verify_host: true
- rsync_opts:
- - --include=/.tox/*/log/*
- - --include=*/
- - --exclude=*
- - --prune-empty-dirs
-
- - 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/tacker-dsvm-functional/run.yaml b/playbooks/legacy/tacker-dsvm-functional/run.yaml
deleted file mode 100644
index 453b8382..00000000
--- a/playbooks/legacy/tacker-dsvm-functional/run.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-tacker-dsvm-functional from old job gate-tacker-dsvm-functional-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
- cat << 'EOF' >>"/tmp/dg-local.conf"
- [[local|localrc]]
- SFC_UPDATE_OVS=False
- enable_plugin heat git://git.openstack.org/openstack/heat
- enable_plugin aodh git://git.openstack.org/openstack/aodh
- enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
- enable_plugin networking-sfc http://git.trystack.cn/openstack/networking-sfc
- enable_plugin mistral git://git.openstack.org/openstack/mistral
- enable_plugin barbican git://git.openstack.org/openstack/barbican
- enable_plugin tacker git://git.openstack.org/openstack/tacker
-
- EOF
- 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=1
- export DEVSTACK_GATE_HORIZON=1
- export DEVSTACK_GATE_TEMPEST=0
- export BRANCH_OVERRIDE=default
- export PROJECTS="openstack/tacker $PROJECTS"
- export PROJECTS="openstack/tacker-horizon $PROJECTS"
- export PROJECTS="openstack/python-tackerclient $PROJECTS"
- export PROJECTS="openstack/heat $PROJECTS"
- export PROJECTS="openstack/aodh $PROJECTS"
- export PROJECTS="openstack/ceilometer $PROJECTS"
- export PROJECTS="openstack/networking-sfc $PROJECTS"
- export PROJECTS="openstack/mistral $PROJECTS"
- export PROJECTS="openstack/mistral-dashboard $PROJECTS"
- export PROJECTS="openstack/python-mistralclient $PROJECTS"
- export PROJECTS="openstack/barbican $PROJECTS"
- export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- function post_test_hook {
- bash -xe $BASE/new/tacker/tacker/tests/contrib/post_test_hook.sh dsvm-functional
- }
- export -f post_test_hook
-
- 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 2e60ce27..b551a419 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -7843,27 +7843,6 @@
run: playbooks/legacy/system-config-puppet-syntax-3/run
timeout: 1800
-- job:
- name: legacy-tacker-dsvm-functional
- parent: legacy-dsvm-base
- run: playbooks/legacy/tacker-dsvm-functional/run
- post-run: playbooks/legacy/tacker-dsvm-functional/post
- timeout: 7800
- required-projects:
- - openstack-infra/devstack-gate
- - openstack/aodh
- - openstack/barbican
- - openstack/ceilometer
- - openstack/heat
- - openstack/mistral
- - openstack/mistral-dashboard
- - openstack/networking-sfc
- - openstack/python-barbicanclient
- - openstack/python-mistralclient
- - openstack/python-tackerclient
- - openstack/tacker
- - openstack/tacker-horizon
-
- job:
name: legacy-telemetry-dsvm-integration-python-ceilometerclient
parent: legacy-dsvm-base