diff --git a/playbooks/legacy/tempest-dsvm-neutron-nova-next-full/post.yaml b/playbooks/legacy/tempest-dsvm-neutron-nova-next-full/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-neutron-nova-next-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-neutron-nova-next-full/run.yaml b/playbooks/legacy/tempest-dsvm-neutron-nova-next-full/run.yaml deleted file mode 100644 index abbd26b7..00000000 --- a/playbooks/legacy/tempest-dsvm-neutron-nova-next-full/run.yaml +++ /dev/null @@ -1,60 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-neutron-nova-next-full from old job - gate-tempest-dsvm-neutron-nova-next-full-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 - # NOTE(mriedem): placement is required starting in Ocata. - export ENABLED_SERVICES=placement-api - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_NEUTRON=1 - # NOTE(mriedem): cells v2 is required starting in Ocata. - export DEVSTACK_LOCAL_CONFIG="NOVA_CONFIGURE_CELLSV2=True" - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - # NOTE(mriedem): NOVA_USE_SERVICE_TOKEN is available starting in Pike - stable_compare="stable/[a-o]" - if [[ ! "$ZUUL_BRANCH" =~ $stable_compare ]] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"NOVA_USE_SERVICE_TOKEN=True" - fi - - function post_test_hook { - if [ -f $BASE/new/nova/tools/hooks/post_test_hook.sh ]; then - $BASE/new/nova/tools/hooks/post_test_hook.sh - fi - } - export -f post_test_hook - 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 f471ef3d..59d3471c 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -4345,18 +4345,6 @@ - openstack/neutron - openstack/tempest -- job: - name: legacy-tempest-dsvm-neutron-nova-next-full - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-neutron-nova-next-full/run.yaml - post-run: playbooks/legacy/tempest-dsvm-neutron-nova-next-full/post.yaml - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/neutron - - openstack/nova - - openstack/tempest - - job: name: legacy-tempest-dsvm-neutron-pecan parent: legacy-dsvm-base