From 913b23be52a2a33d4d5d4307b0118d2ec1128b49 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Fri, 29 Sep 2017 10:02:15 -0400 Subject: [PATCH] Remove legacy-tempest-dsvm-nnet >newton jobs nova-network only runs in a cells v1 config starting in ocata so these jobs won't work. We already have a nova-network job for newton, so that should be sufficient. Depends-On: I12fcc305cdc834f65ef87b2f9176b17018f0d84c Change-Id: I51ae492e1e35d2ad1d96dfee560ccd1e7188629d --- .../post.yaml | 15 ------- .../periodic-tempest-dsvm-nnet-ocata/run.yaml | 43 ------------------- .../periodic-tempest-dsvm-nnet-pike/post.yaml | 15 ------- .../periodic-tempest-dsvm-nnet-pike/run.yaml | 43 ------------------- .../legacy/tempest-dsvm-nnet-ocata/post.yaml | 15 ------- .../legacy/tempest-dsvm-nnet-ocata/run.yaml | 43 ------------------- zuul.d/zuul-legacy-jobs.yaml | 30 ------------- 7 files changed, 204 deletions(-) delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-nnet-ocata/post.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-nnet-ocata/run.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-nnet-pike/post.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-nnet-pike/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-nnet-ocata/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-nnet-ocata/run.yaml diff --git a/playbooks/legacy/periodic-tempest-dsvm-nnet-ocata/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-nnet-ocata/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-nnet-ocata/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/periodic-tempest-dsvm-nnet-ocata/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-nnet-ocata/run.yaml deleted file mode 100644 index 0bc28b97..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-nnet-ocata/run.yaml +++ /dev/null @@ -1,43 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-nnet-ocata from old job periodic-tempest-dsvm-nnet-ubuntu-xenial-ocata - 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 PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_TLSPROXY=1 - export DEVSTACK_GATE_NEUTRON=0 - export BRANCH_OVERRIDE=stable/ocata - 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/playbooks/legacy/periodic-tempest-dsvm-nnet-pike/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-nnet-pike/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-nnet-pike/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/periodic-tempest-dsvm-nnet-pike/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-nnet-pike/run.yaml deleted file mode 100644 index 5da51612..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-nnet-pike/run.yaml +++ /dev/null @@ -1,43 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-nnet-pike from old job periodic-tempest-dsvm-nnet-ubuntu-xenial-pike - 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 PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_TLSPROXY=1 - export DEVSTACK_GATE_NEUTRON=0 - export BRANCH_OVERRIDE=stable/pike - 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/playbooks/legacy/tempest-dsvm-nnet-ocata/post.yaml b/playbooks/legacy/tempest-dsvm-nnet-ocata/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-nnet-ocata/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-nnet-ocata/run.yaml b/playbooks/legacy/tempest-dsvm-nnet-ocata/run.yaml deleted file mode 100644 index 1418e887..00000000 --- a/playbooks/legacy/tempest-dsvm-nnet-ocata/run.yaml +++ /dev/null @@ -1,43 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-nnet-ocata from old job gate-tempest-dsvm-nnet-ubuntu-xenial-ocata-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 PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_TLSPROXY=1 - export DEVSTACK_GATE_NEUTRON=0 - export BRANCH_OVERRIDE=stable/ocata - 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 dfd333e1..50c159d0 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -8435,26 +8435,6 @@ - openstack-infra/devstack-gate - openstack/tempest -- job: - name: legacy-periodic-tempest-dsvm-nnet-ocata - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-nnet-ocata/run - post-run: playbooks/legacy/periodic-tempest-dsvm-nnet-ocata/post - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/tempest - -- job: - name: legacy-periodic-tempest-dsvm-nnet-pike - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-nnet-pike/run - post-run: playbooks/legacy/periodic-tempest-dsvm-nnet-pike/post - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/tempest - - job: name: legacy-periodic-tempest-dsvm-oslo-latest-full-master parent: legacy-dsvm-base @@ -13891,16 +13871,6 @@ - openstack-infra/devstack-gate - openstack/tempest -- job: - name: legacy-tempest-dsvm-nnet-ocata - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-nnet-ocata/run - post-run: playbooks/legacy/tempest-dsvm-nnet-ocata/post - timeout: 10800 - required-projects: - - openstack-infra/devstack-gate - - openstack/tempest - - job: name: legacy-tempest-dsvm-nova-libvirt-kvm-apr parent: legacy-dsvm-base