diff options
| -rw-r--r-- | .zuul.yaml | 8 | ||||
| -rw-r--r-- | playbooks/legacy/neutron-tempest-dvr/post.yaml | 15 | ||||
| -rw-r--r-- | playbooks/legacy/neutron-tempest-dvr/run.yaml | 44 |
3 files changed, 5 insertions, 62 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index a62b556645..698981e5ff 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -168,14 +168,16 @@ - job: name: neutron-tempest-dvr - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-tempest-dvr/run.yaml - post-run: playbooks/legacy/neutron-tempest-dvr/post.yaml + parent: tempest-full-py3 timeout: 10800 required-projects: - openstack-infra/devstack-gate - openstack/neutron - openstack/tempest + vars: + tempest_concurrency: 4 + devstack_localrc: + Q_DVR_MODE: dvr_snat irrelevant-files: *tempest-irrelevant-files - job: diff --git a/playbooks/legacy/neutron-tempest-dvr/post.yaml b/playbooks/legacy/neutron-tempest-dvr/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/neutron-tempest-dvr/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/neutron-tempest-dvr/run.yaml b/playbooks/legacy/neutron-tempest-dvr/run.yaml deleted file mode 100644 index 9cb227547a..0000000000 --- a/playbooks/legacy/neutron-tempest-dvr/run.yaml +++ /dev/null @@ -1,44 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-neutron-dvr from old job gate-tempest-dsvm-neutron-dvr-ubuntu-xenial - 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 PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_NEUTRON_DVR=1 - export DEVSTACK_GATE_TLSPROXY=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - 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 }}' |