diff --git a/playbooks/legacy/grenade-dsvm-sahara/post.yaml b/playbooks/legacy/grenade-dsvm-sahara/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/grenade-dsvm-sahara/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/grenade-dsvm-sahara/run.yaml b/playbooks/legacy/grenade-dsvm-sahara/run.yaml deleted file mode 100644 index 4b6f91c7..00000000 --- a/playbooks/legacy/grenade-dsvm-sahara/run.yaml +++ /dev/null @@ -1,51 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-grenade-dsvm-sahara from old job gate-grenade-dsvm-sahara-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 - export PROJECTS="openstack-dev/grenade $PROJECTS" - export PROJECTS="openstack/sahara $PROJECTS" - export PROJECTS="openstack/python-saharaclient $PROJECTS" - export PROJECTS="openstack/heat-tempest-plugin $PROJECTS" - export PYTHONUNBUFFERED=true - export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://git.openstack.org/openstack/sahara" - export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://git.openstack.org/openstack/heat" - - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_GRENADE=pullup - 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 c2bc0bb4..a02d36ae 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -323,22 +323,6 @@ nodeset: legacy-ubuntu-xenial-2-node branches: ^(?!stable/(newton|ocata)).*$ -- job: - name: legacy-grenade-dsvm-sahara - parent: legacy-dsvm-base - run: playbooks/legacy/grenade-dsvm-sahara/run.yaml - post-run: playbooks/legacy/grenade-dsvm-sahara/post.yaml - timeout: 7800 - required-projects: - - openstack-dev/devstack - - openstack-dev/grenade - - openstack-infra/devstack-gate - - openstack/ara - - openstack/heat - - openstack/heat-tempest-plugin - - openstack/python-saharaclient - - openstack/sahara - - job: name: legacy-group-based-policy-dsvm-aim parent: legacy-dsvm-base