Browse Source

Merge "Migrate neutron-tempest-dvr job to zuulv3 and python 3"

tags/14.0.0.0b2
Zuul 5 months ago
parent
commit
4cddf62bbe

+ 5
- 3
.zuul.yaml View File

@@ -168,14 +168,16 @@
168 168
 
169 169
 - job:
170 170
     name: neutron-tempest-dvr
171
-    parent: legacy-dsvm-base
172
-    run: playbooks/legacy/neutron-tempest-dvr/run.yaml
173
-    post-run: playbooks/legacy/neutron-tempest-dvr/post.yaml
171
+    parent: tempest-full-py3
174 172
     timeout: 10800
175 173
     required-projects:
176 174
       - openstack-infra/devstack-gate
177 175
       - openstack/neutron
178 176
       - openstack/tempest
177
+    vars:
178
+      tempest_concurrency: 4
179
+      devstack_localrc:
180
+        Q_DVR_MODE: dvr_snat
179 181
     irrelevant-files: *tempest-irrelevant-files
180 182
 
181 183
 - job:

+ 0
- 15
playbooks/legacy/neutron-tempest-dvr/post.yaml View File

@@ -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

+ 0
- 44
playbooks/legacy/neutron-tempest-dvr/run.yaml View File

@@ -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 }}'

Loading…
Cancel
Save