From 9a00135243fa23c1640965bac4d3ecc6a16ad0e2 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Fri, 14 May 2021 08:21:05 +0200 Subject: [PATCH] Remove neutron and networking-midonet Ocata jobs definitions This patch removes legacy-neutron-dsvm-api job definition It seems that this job was used only in the Neutron stable/Ocata branch which is going to be EOL with [1]. In the stable/Pike branch Neutron is using only "legacy-neutron-dsvm-api-pecan" job which isn't removed by that patch. It also removes networking-midonet jobs: * periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata * periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata As those jobs were also used only in Ocata branch which is EOL in networking-midonet already. [1] https://review.opendev.org/c/openstack/releases/+/790904 Change-Id: I7b9e6cb20d7b8d8d1dff9b8bee2c652df743b2ba --- playbooks/legacy/neutron-dsvm-api/post.yaml | 80 ------------------- playbooks/legacy/neutron-dsvm-api/run.yaml | 55 ------------- .../post.yaml | 15 ---- .../run.yaml | 58 -------------- .../post.yaml | 15 ---- .../run.yaml | 58 -------------- zuul.d/zuul-legacy-jobs.yaml | 40 ---------- 7 files changed, 321 deletions(-) delete mode 100644 playbooks/legacy/neutron-dsvm-api/post.yaml delete mode 100644 playbooks/legacy/neutron-dsvm-api/run.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/post.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/run.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata/post.yaml delete mode 100644 playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata/run.yaml diff --git a/playbooks/legacy/neutron-dsvm-api/post.yaml b/playbooks/legacy/neutron-dsvm-api/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/neutron-dsvm-api/post.yaml +++ /dev/null @@ -1,80 +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=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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/neutron-dsvm-api/run.yaml b/playbooks/legacy/neutron-dsvm-api/run.yaml deleted file mode 100644 index 05dc73fe..00000000 --- a/playbooks/legacy/neutron-dsvm-api/run.yaml +++ /dev/null @@ -1,55 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-neutron-dsvm-api from old job gate-neutron-dsvm-api-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_TEMPEST=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_EXERCISES=0 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_TEMPEST_REGEX="^neutron.tests.tempest.api\." - - function gate_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh api - } - export -f gate_hook - - function post_test_hook { - bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh api - } - 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/playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-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-networking-midonet-aio-ml2-full-ocata/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/run.yaml deleted file mode 100644 index 5d0b40c6..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/run.yaml +++ /dev/null @@ -1,58 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata - from old job periodic-tempest-dsvm-networking-midonet-aio-ml2-full-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/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_TEMPEST=1 - export BRANCH_OVERRIDE=stable/ocata - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TOPOLOGY=aio - - # Because we are testing a non standard project, add - # our project repository. This makes zuul do the right - # reference magic for testing changes. - export PROJECTS="openstack/networking-midonet $PROJECTS" - export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" - export PROJECTS="x/networking-l2gw $PROJECTS" - export PROJECTS="x/tap-as-a-service $PROJECTS" - - function gate_hook { - bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ml2-full - } - export -f gate_hook - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc - - 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-networking-midonet-aio-v2-full-ocata/post.yaml b/playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-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-networking-midonet-aio-v2-full-ocata/run.yaml b/playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata/run.yaml deleted file mode 100644 index 2cd3a11c..00000000 --- a/playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata/run.yaml +++ /dev/null @@ -1,58 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata - from old job periodic-tempest-dsvm-networking-midonet-aio-v2-full-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/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_TEMPEST=1 - export BRANCH_OVERRIDE=stable/ocata - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TOPOLOGY=aio - - # Because we are testing a non standard project, add - # our project repository. This makes zuul do the right - # reference magic for testing changes. - export PROJECTS="openstack/networking-midonet $PROJECTS" - export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS" - export PROJECTS="x/networking-l2gw $PROJECTS" - export PROJECTS="x/tap-as-a-service $PROJECTS" - - function gate_hook { - bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh v2-full - } - export -f gate_hook - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc - - 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 c9aa0747..e8c1955d 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -263,16 +263,6 @@ - openstack/networking-bgpvpn - openstack/networking-sfc -- job: - name: legacy-neutron-dsvm-api - parent: legacy-dsvm-base - run: playbooks/legacy/neutron-dsvm-api/run.yaml - post-run: playbooks/legacy/neutron-dsvm-api/post.yaml - timeout: 7800 - required-projects: - - openstack/devstack-gate - - openstack/neutron - - job: name: legacy-neutron-dsvm-api-pecan parent: legacy-dsvm-base @@ -401,36 +391,6 @@ - openstack/neutron-dynamic-routing - openstack/tempest -- job: - name: legacy-periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/run.yaml - post-run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-ml2-full-ocata/post.yaml - timeout: 7800 - branches: stable/ocata - required-projects: - - openstack/devstack-gate - - x/networking-l2gw - - openstack/networking-midonet - - openstack/neutron-dynamic-routing - - x/tap-as-a-service - - openstack/tempest - -- job: - name: legacy-periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata - parent: legacy-dsvm-base - run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata/run.yaml - post-run: playbooks/legacy/periodic-tempest-dsvm-networking-midonet-aio-v2-full-ocata/post.yaml - branches: stable/ocata - timeout: 7800 - required-projects: - - openstack/devstack-gate - - x/networking-l2gw - - openstack/networking-midonet - - openstack/neutron-dynamic-routing - - x/tap-as-a-service - - openstack/tempest - - job: name: legacy-puppet-lint parent: legacy-base