summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-10 01:58:11 +0000
committerGerrit Code Review <review@openstack.org>2019-01-10 01:58:11 +0000
commit4cddf62bbe571472c453c8c9e86bc4ea0e65d5ba (patch)
tree0c48edce5e39e2cfa405410cd0224bbe440f199a
parent630ff78409560296e66a127a6356df44b64d8548 (diff)
parent7ae764eff9fd4490b5b4e4d215e6bd647e3cd76a (diff)
Merge "Migrate neutron-tempest-dvr job to zuulv3 and python 3"
-rw-r--r--.zuul.yaml8
-rw-r--r--playbooks/legacy/neutron-tempest-dvr/post.yaml15
-rw-r--r--playbooks/legacy/neutron-tempest-dvr/run.yaml44
3 files changed, 5 insertions, 62 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index fb24b61..4df5b32 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -168,14 +168,16 @@
168 168
169- job: 169- job:
170 name: neutron-tempest-dvr 170 name: neutron-tempest-dvr
171 parent: legacy-dsvm-base 171 parent: tempest-full-py3
172 run: playbooks/legacy/neutron-tempest-dvr/run.yaml
173 post-run: playbooks/legacy/neutron-tempest-dvr/post.yaml
174 timeout: 10800 172 timeout: 10800
175 required-projects: 173 required-projects:
176 - openstack-infra/devstack-gate 174 - openstack-infra/devstack-gate
177 - openstack/neutron 175 - openstack/neutron
178 - openstack/tempest 176 - openstack/tempest
177 vars:
178 tempest_concurrency: 4
179 devstack_localrc:
180 Q_DVR_MODE: dvr_snat
179 irrelevant-files: *tempest-irrelevant-files 181 irrelevant-files: *tempest-irrelevant-files
180 182
181- job: 183- job:
diff --git a/playbooks/legacy/neutron-tempest-dvr/post.yaml b/playbooks/legacy/neutron-tempest-dvr/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/legacy/neutron-tempest-dvr/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
1- hosts: primary
2 tasks:
3
4 - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
5 synchronize:
6 src: '{{ ansible_user_dir }}/workspace/'
7 dest: '{{ zuul.executor.log_root }}'
8 mode: pull
9 copy_links: true
10 verify_host: true
11 rsync_opts:
12 - --include=/logs/**
13 - --include=*/
14 - --exclude=*
15 - --prune-empty-dirs
diff --git a/playbooks/legacy/neutron-tempest-dvr/run.yaml b/playbooks/legacy/neutron-tempest-dvr/run.yaml
deleted file mode 100644
index 9cb2275..0000000
--- a/playbooks/legacy/neutron-tempest-dvr/run.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-tempest-dsvm-neutron-dvr from old job gate-tempest-dsvm-neutron-dvr-ubuntu-xenial
3 tasks:
4
5 - name: Ensure legacy workspace directory
6 file:
7 path: '{{ ansible_user_dir }}/workspace'
8 state: directory
9
10 - shell:
11 cmd: |
12 set -e
13 set -x
14 cat > clonemap.yaml << EOF
15 clonemap:
16 - name: openstack-infra/devstack-gate
17 dest: devstack-gate
18 EOF
19 /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
20 git://git.openstack.org \
21 openstack-infra/devstack-gate
22 executable: /bin/bash
23 chdir: '{{ ansible_user_dir }}/workspace'
24 environment: '{{ zuul | zuul_legacy_vars }}'
25
26 - shell:
27 cmd: |
28 set -e
29 set -x
30 export PYTHONUNBUFFERED=true
31 export DEVSTACK_GATE_TEMPEST=1
32 export DEVSTACK_GATE_NEUTRON=1
33 export DEVSTACK_GATE_TEMPEST_FULL=1
34 export DEVSTACK_GATE_NEUTRON_DVR=1
35 export DEVSTACK_GATE_TLSPROXY=1
36 export BRANCH_OVERRIDE=default
37 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
38 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
39 fi
40 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
41 ./safe-devstack-vm-gate-wrap.sh
42 executable: /bin/bash
43 chdir: '{{ ansible_user_dir }}/workspace'
44 environment: '{{ zuul | zuul_legacy_vars }}'