diff --git a/.zuul.yaml b/.zuul.yaml index a2fa3c2346..8b580bcb01 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,14 +1,3 @@ -- job: - name: glance-dsvm-grenade-multinode - parent: legacy-dsvm-base-multinode - run: playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml - post-run: playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml - timeout: 10800 - required-projects: - - openstack/grenade - - openstack/devstack-gate - - openstack/glance - - job: name: glance-eventlet-ssl-handshake-broken-py3 parent: tox @@ -279,7 +268,7 @@ - glance-tox-functional-glance_store-tips - glance-tox-functional-py36-glance_store-tips - barbican-simple-crypto-devstack-tempest - - glance-dsvm-grenade-multinode + - grenade-multinode - devstack-plugin-ceph-tempest-py3: irrelevant-files: *tempest-irrelevant-files - tempest-pg-full: diff --git a/playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml b/playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/glance-dsvm-grenade-multinode/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/glance-dsvm-grenade-multinode/run.yaml b/playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml deleted file mode 100644 index bc7e1b11b9..0000000000 --- a/playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml +++ /dev/null @@ -1,45 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-glance-dsvm-grenade-multinode from old job gate-glance-dsvm-grenade-multinode-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/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/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_NEUTRON=1 - export DEVSTACK_GATE_CONFIGDRIVE=0 - export DEVSTACK_GATE_GRENADE=pullup - export PROJECTS="openstack/grenade $PROJECTS" - 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 }}'