diff --git a/playbooks/legacy/functional-neutron-dsvm-gceapi/post.yaml b/playbooks/legacy/functional-neutron-dsvm-gceapi/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/functional-neutron-dsvm-gceapi/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/functional-neutron-dsvm-gceapi/run.yaml b/playbooks/legacy/functional-neutron-dsvm-gceapi/run.yaml deleted file mode 100644 index f6d04056..00000000 --- a/playbooks/legacy/functional-neutron-dsvm-gceapi/run.yaml +++ /dev/null @@ -1,69 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-functional-neutron-dsvm-gceapi from old job gate-functional-neutron-dsvm-gceapi-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_plugin gce-api git://git.openstack.org/openstack/gce-api - - 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_NOTESTS=1 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export PROJECTS="openstack/gce-api $PROJECTS" - - if [ "neutron" = "neutron" ] ; then - export DEVSTACK_GATE_NEUTRON=1 - else - export DEVSTACK_GATE_NEUTRON=0 - fi - - function post_test_hook { - source $BASE/new/devstack/accrc/admin/admin - cd /opt/stack/new/gce-api/ - ./gceapi/tests/contrib/post_test_hook.sh - } - 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 8e3b3d8d..0390a5d6 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -125,17 +125,6 @@ run: playbooks/legacy/fuel-octane-puppet-lint/run.yaml timeout: 1800 -- job: - name: legacy-functional-neutron-dsvm-gceapi - parent: legacy-dsvm-base - run: playbooks/legacy/functional-neutron-dsvm-gceapi/run.yaml - post-run: playbooks/legacy/functional-neutron-dsvm-gceapi/post.yaml - timeout: 7500 - required-projects: - - openstack-infra/devstack-gate - - openstack/gce-api - - openstack/neutron - - job: name: legacy-fuxi-dsvm-fullstack parent: legacy-dsvm-base