diff --git a/.zuul.yaml b/.zuul.yaml index fd3aa2a8e7..fc5e79f914 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -101,7 +101,7 @@ - master description: | Base multinode integration test with Neutron networking and py27. - Former names for this job where: + Former names for this job were: * neutron-tempest-multinode-full * legacy-tempest-dsvm-neutron-multinode-full * gate-tempest-dsvm-neutron-multinode-full-ubuntu-xenial-nv @@ -142,21 +142,26 @@ Base integration test with Neutron networking and py36. voting: false -# TODO(gmann): needs to migrate this to zuulv3 - job: name: tempest-scenario-all - parent: legacy-dsvm-base-multinode + parent: tempest-multinode-full + branches: + - master description: | - This job will run all scenario tests including slow tests - with lvm multibackend setup. This job will not run any API tests. - run: playbooks/tempest-scenario-multinode-lvm-multibackend/run.yaml - post-run: playbooks/tempest-scenario-multinode-lvm-multibackend/post.yaml + This multinode integration job will run all scenario tests including slow + tests with lvm multibackend setup. This job will not run any API tests. + + Former names for this job were: + * legacy-tempest-dsvm-neutron-scenario-multinode-lvm-multibackend + * tempest-scenario-multinode-lvm-multibackend timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/tempest - nodeset: ubuntu-xenial-2-node + vars: + # 'all' is used for applying the custom regex below. + tox_envlist: all + devstack_localrc: + CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2 + tempest_concurrency: 2 + tempest_test_regex: (^tempest\.(scenario)) - job: name: tempest-full-queens diff --git a/playbooks/tempest-scenario-multinode-lvm-multibackend/post.yaml b/playbooks/tempest-scenario-multinode-lvm-multibackend/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/tempest-scenario-multinode-lvm-multibackend/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/tempest-scenario-multinode-lvm-multibackend/run.yaml b/playbooks/tempest-scenario-multinode-lvm-multibackend/run.yaml deleted file mode 100644 index 57b407428b..0000000000 --- a/playbooks/tempest-scenario-multinode-lvm-multibackend/run.yaml +++ /dev/null @@ -1,65 +0,0 @@ -- hosts: primary - name: Autoconverted job tempest-scenario-multinode-lvm-multibackend - from old job gate-tempest-dsvm-neutron-scenario-multinode-lvm-multibackend-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 - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - ENABLE_IDENTITY_V2=False - TEMPEST_USE_TEST_ACCOUNTS=True - # Enable lvm multiple backends to run multi backend slow scenario tests. - # Note: multi backend experimental job exclude the slow scenario tests. - CINDER_ENABLED_BACKENDS=lvm:lvmdriver-1,lvm:lvmdriver-2 - - 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=1 - # Run all scenario tests including slow tests with concurrency 2 - export DEVSTACK_GATE_TEMPEST_REGEX='(^tempest\.(scenario))' - export TEMPEST_CONCURRENCY=2 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TLSPROXY=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TOPOLOGY="multinode" - - 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 }}'