From e406213ae809079435131918af3631cb92b64062 Mon Sep 17 00:00:00 2001
From: Tovin Seven <vinhnt@vn.fujitsu.com>
Date: Fri, 13 Oct 2017 16:16:06 +0700
Subject: [PATCH] Remove legacy oslo.versionedobjects job
Depends-On: I22b4422104131f7e475c1c8ba1e7d69ec4f278b1
Depends-On: Ia59004029a44ad5109b15186b9cfa131ff519026
Change-Id: I87b55c19eae06553b21c89c06614dda341680248
---
.../post.yaml | 15 ------
.../run.yaml | 52 -------------------
zuul.d/zuul-legacy-jobs.yaml | 12 -----
3 files changed, 79 deletions(-)
delete mode 100644 playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/post.yaml
delete mode 100644 playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/run.yaml
diff --git a/playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/post.yaml b/playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/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/oslo.versionedobjects-src-grenade-dsvm-multinode/run.yaml b/playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/run.yaml
deleted file mode 100644
index 72c0ddb4..00000000
--- a/playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/run.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-- hosts: primary
- name: Autoconverted job legacy-oslo.versionedobjects-src-grenade-dsvm-multinode
- from old job gate-oslo.versionedobjects-src-grenade-dsvm-multinode-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 PROJECTS="openstack-dev/grenade $PROJECTS"
- export PYTHONUNBUFFERED=true
- export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_GRENADE=pullup
- export BRANCH_OVERRIDE=default
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
- export DEVSTACK_GATE_TOPOLOGY="multinode"
- export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
-
- # Even if the branch is overridden, make sure we use
- # the correct branch using the OVERRIDE_*_PROJECT_BRANCH
- # variable.
- uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'`
- export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH
-
- 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 d68cb8dc..2e60ce27 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -4474,18 +4474,6 @@
required-projects:
- openstack/requirements
-- job:
- name: legacy-oslo.versionedobjects-src-grenade-dsvm-multinode
- parent: legacy-dsvm-base-multinode
- run: playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/run
- post-run: playbooks/legacy/oslo.versionedobjects-src-grenade-dsvm-multinode/post
- timeout: 10800
- required-projects:
- - openstack-dev/grenade
- - openstack-infra/devstack-gate
- - openstack/oslo.versionedobjects
- nodeset: legacy-ubuntu-xenial-2-node
-
- job:
name: legacy-ospurge-dsvm-functional
parent: legacy-dsvm-base