From d0d82d55c228b4c81eeee42cb214193dddc90b60 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 10 Sep 2018 20:06:58 +0200
Subject: [PATCH] Remove legacy-devstack-plugin-container-dsvm
the job has been moved in-repo, remove it.
Depends-On: https://review.openstack.org/601032
Change-Id: Ia7b51ec13aa5d53dce5d827dab136d4c77687ffe
---
.../devstack-plugin-container-dsvm/post.yaml | 80 -------------------
.../devstack-plugin-container-dsvm/run.yaml | 69 ----------------
zuul.d/zuul-legacy-jobs.yaml | 11 ---
3 files changed, 160 deletions(-)
delete mode 100644 playbooks/legacy/devstack-plugin-container-dsvm/post.yaml
delete mode 100644 playbooks/legacy/devstack-plugin-container-dsvm/run.yaml
diff --git a/playbooks/legacy/devstack-plugin-container-dsvm/post.yaml b/playbooks/legacy/devstack-plugin-container-dsvm/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/devstack-plugin-container-dsvm/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/devstack-plugin-container-dsvm/run.yaml b/playbooks/legacy/devstack-plugin-container-dsvm/run.yaml
deleted file mode 100644
index a4b7f123..00000000
--- a/playbooks/legacy/devstack-plugin-container-dsvm/run.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-devstack-plugin-container-dsvm from old job gate-devstack-plugin-container-dsvm-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]]
- enable_plugin devstack-plugin-container git://git.openstack.org/openstack/devstack-plugin-container
-
- 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_TEMPEST=0
-
- export BRANCH_OVERRIDE=default
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
- # Keep localrc to be able to set some vars in post_test_hook
- export KEEP_LOCALRC=1
-
- function gate_hook {
- bash -xe $BASE/new/devstack-plugin-container/contrib/gate_hook.sh
- }
- export -f gate_hook
-
- function post_test_hook {
- bash -xe $BASE/new/devstack-plugin-container/contrib/post_test_hook.sh fullstack
- }
- 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 8e3b3d8d..4d022d81 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -49,17 +49,6 @@
- openstack/sahara
- openstack/sahara-dashboard
-- job:
- name: legacy-devstack-plugin-container-dsvm
- parent: legacy-dsvm-base
- run: playbooks/legacy/devstack-plugin-container-dsvm/run.yaml
- post-run: playbooks/legacy/devstack-plugin-container-dsvm/post.yaml
- timeout: 4200
- required-projects:
- - openstack-dev/devstack
- - openstack-infra/devstack-gate
- - openstack/devstack-plugin-container
-
- job:
name: legacy-dox-buildimages
parent: legacy-base