diff --git a/playbooks/legacy/tempest-dsvm-lvm/post.yaml b/playbooks/legacy/tempest-dsvm-lvm/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-lvm/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/tempest-dsvm-lvm/run.yaml b/playbooks/legacy/tempest-dsvm-lvm/run.yaml deleted file mode 100644 index 5b032b23..00000000 --- a/playbooks/legacy/tempest-dsvm-lvm/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-lvm from old job gate-tempest-dsvm-lvm-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 - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - NOVA_BACKEND=LVM - LVM_VOLUME_CLEAR=none - - 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 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova/devstack/tempest-dsvm-lvm-rc - - 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/playbooks/legacy/tempest-dsvm-lxc/post.yaml b/playbooks/legacy/tempest-dsvm-lxc/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-lxc/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/tempest-dsvm-lxc/run.yaml b/playbooks/legacy/tempest-dsvm-lxc/run.yaml deleted file mode 100644 index 95819a6b..00000000 --- a/playbooks/legacy/tempest-dsvm-lxc/run.yaml +++ /dev/null @@ -1,57 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-lxc from old job gate-tempest-dsvm-lxc-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 - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - LIBVIRT_TYPE=lxc - NOVA_BACKEND=LVM - - 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 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova/devstack/tempest-dsvm-lxc-rc - - 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/playbooks/legacy/tempest-dsvm-nova-wsgi-full/post.yaml b/playbooks/legacy/tempest-dsvm-nova-wsgi-full/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-nova-wsgi-full/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/tempest-dsvm-nova-wsgi-full/run.yaml b/playbooks/legacy/tempest-dsvm-nova-wsgi-full/run.yaml deleted file mode 100644 index c45d17a0..00000000 --- a/playbooks/legacy/tempest-dsvm-nova-wsgi-full/run.yaml +++ /dev/null @@ -1,55 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-nova-wsgi-full from old job gate-tempest-dsvm-nova-wsgi-full-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 - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - NOVA_USE_MOD_WSGI=True - - 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 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_NEUTRON=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 }}' diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index bfa70958..13e47713 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -4741,16 +4741,6 @@ - openstack-infra/devstack-gate - openstack/tempest -- job: - name: legacy-tempest-dsvm-lvm - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-lvm/run.yaml - post-run: playbooks/legacy/tempest-dsvm-lvm/post.yaml - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/tempest - - job: name: legacy-tempest-dsvm-lvm-multibackend parent: legacy-dsvm-base @@ -4761,16 +4751,6 @@ - openstack-infra/devstack-gate - openstack/tempest -- job: - name: legacy-tempest-dsvm-lxc - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-lxc/run.yaml - post-run: playbooks/legacy/tempest-dsvm-lxc/post.yaml - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/tempest - - job: name: legacy-tempest-dsvm-lxd-linuxbridge parent: legacy-dsvm-base @@ -5212,6 +5192,17 @@ - openstack/tempest - openstack/neutron-lib +# TODO(stephenfin): These jobs are artifacts of the migration process. +# Initially there was only one job - 'tempest-dsvm-neutron-src-{name}' - where +# '{name}' was set to the name of the project being tested. This was mainly run +# for library projects as part of the 'lib-forward-testing-{name}' job. However +# some non-library projects wanted to also run these tests against important +# libraries and called the job specifically with the library. The end result +# is jobs that look identical to 'legacy-tempest-dsvm-neutron-src' but with a +# specific library. Eventually, when 'legacy-tempest-dsvm-neutron-src' is +# migrated to zuulv3-native jobs, these should be removed in favour of this one +# central job again. + - job: name: legacy-tempest-dsvm-neutron-src-oslo.versionedobjects parent: legacy-dsvm-base @@ -5224,20 +5215,6 @@ - openstack/oslo.versionedobjects - openstack/tempest -- job: - name: legacy-tempest-dsvm-neutron-src-plugin - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-neutron-src-plugin/run.yaml - post-run: playbooks/legacy/tempest-dsvm-neutron-src-plugin/post.yaml - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/tempest - irrelevant-files: - - ^(test-|)requirements.txt$ - - ^setup.cfg$ - - job: name: legacy-tempest-dsvm-neutron-src-python-saharaclient parent: legacy-dsvm-base @@ -5254,6 +5231,20 @@ - openstack/sahara-tests - openstack/tempest +- job: + name: legacy-tempest-dsvm-neutron-src-plugin + parent: legacy-dsvm-base + run: playbooks/legacy/tempest-dsvm-neutron-src-plugin/run.yaml + post-run: playbooks/legacy/tempest-dsvm-neutron-src-plugin/post.yaml + timeout: 10800 + required-projects: + - openstack-infra/devstack-gate + - openstack/neutron + - openstack/tempest + irrelevant-files: + - ^(test-|)requirements.txt$ + - ^setup.cfg$ + - job: name: legacy-tempest-dsvm-neutron-with-ryu-master parent: legacy-dsvm-base @@ -5320,20 +5311,6 @@ - openstack/nova - openstack/tempest -- job: - name: legacy-tempest-dsvm-nova-wsgi-full - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-nova-wsgi-full/run.yaml - post-run: playbooks/legacy/tempest-dsvm-nova-wsgi-full/post.yaml - timeout: 10800 - # NOVA_USE_MOD_WSGI=True has been the default in devstack since Pike so - # this job is only interesting in stable/ocata. - branches: ^stable/ocata$ - required-projects: - - openstack-infra/devstack-gate - - openstack/nova - - openstack/tempest - - job: name: legacy-tempest-dsvm-py35 parent: legacy-dsvm-base