From 8bc650905a53498bf021f493abe974142d438c26 Mon Sep 17 00:00:00 2001 From: elajkat Date: Fri, 17 Jun 2022 15:07:46 +0200 Subject: [PATCH] Remove legacy only jobs for bagpipe and bgpvpn projects As we EOL queens, rocky and stein for networking stadium projects some legacy jobs can be removed: - legacy-tempest-dsvm-networking-bagpipe - legacy-tempest-dsvm-networking-bgpvpn-bagpipe - legacy-networking-bagpipe-dsvm-fullstack Change-Id: I5782410fc0303599e101912719c7b630908921e5 Depends-On: https://review.opendev.org/c/openstack/releases/+/846188 --- .../post.yaml | 80 ------------------ .../run.yaml | 82 ------------------ .../tempest-dsvm-networking-bagpipe/post.yaml | 15 ---- .../tempest-dsvm-networking-bagpipe/run.yaml | 55 ------------ .../post.yaml | 15 ---- .../run.yaml | 83 ------------------- zuul.d/zuul-legacy-jobs.yaml | 36 -------- 7 files changed, 366 deletions(-) delete mode 100644 playbooks/legacy/networking-bagpipe-dsvm-fullstack/post.yaml delete mode 100644 playbooks/legacy/networking-bagpipe-dsvm-fullstack/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-networking-bagpipe/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-networking-bagpipe/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-networking-bgpvpn-bagpipe/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-networking-bgpvpn-bagpipe/run.yaml diff --git a/playbooks/legacy/networking-bagpipe-dsvm-fullstack/post.yaml b/playbooks/legacy/networking-bagpipe-dsvm-fullstack/post.yaml deleted file mode 100644 index dac87534..00000000 --- a/playbooks/legacy/networking-bagpipe-dsvm-fullstack/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/networking-bagpipe-dsvm-fullstack/run.yaml b/playbooks/legacy/networking-bagpipe-dsvm-fullstack/run.yaml deleted file mode 100644 index f99c0309..00000000 --- a/playbooks/legacy/networking-bagpipe-dsvm-fullstack/run.yaml +++ /dev/null @@ -1,82 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-networking-bagpipe-dsvm-fullstack from old job gate-networking-bagpipe-dsvm-fullstack-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 - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin networking-bagpipe https://opendev.org/openstack/networking-bagpipe - - 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=0 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - # 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-bagpipe $PROJECTS" - # we need to add networking-bgpvpn as well, which we - # depend on - export PROJECTS="openstack/networking-bgpvpn $PROJECTS" - - function pre_test_hook { - . $BASE/new/networking-bagpipe/devstack/pre_test_hook.sh fullstack - } - export -f pre_test_hook - - function gate_hook { - bash -xe $BASE/new/networking-bagpipe/devstack/gate_hook.sh fullstack - } - export -f gate_hook - - function post_test_hook { - . $BASE/new/networking-bagpipe/devstack/post_test_hook.sh fullstack - } - export -f post_test_hook - - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-bagpipe/devstack/devstack-gate-rc - - 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-networking-bagpipe/post.yaml b/playbooks/legacy/tempest-dsvm-networking-bagpipe/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-bagpipe/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-networking-bagpipe/run.yaml b/playbooks/legacy/tempest-dsvm-networking-bagpipe/run.yaml deleted file mode 100644 index 4ce17146..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-bagpipe/run.yaml +++ /dev/null @@ -1,55 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-networking-bagpipe from old job gate-tempest-dsvm-networking-bagpipe - 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 - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin networking-bagpipe https://opendev.org/openstack/networking-bagpipe - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: "set -e\nset -x\nexport PYTHONUNBUFFERED=true\nexport DEVSTACK_GATE_TEMPEST=1\n\ - export DEVSTACK_GATE_TEMPEST_FULL=1\nexport DEVSTACK_GATE_NEUTRON=1\nexport\ - \ BRANCH_OVERRIDE=default\nif [ \"$BRANCH_OVERRIDE\" != \"default\" ] ;\ - \ then\n export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE\nfi\n# Because\ - \ we are testing a non standard project, add\n# our project repository.\ - \ This makes zuul do the right\n# reference magic for testing changes.\n\ - export PROJECTS=\"openstack/networking-bagpipe $PROJECTS\"\n# we need to\ - \ add networking-bgpvpn as well, which we\n# depend on\nexport PROJECTS=\"\ - openstack/networking-bgpvpn $PROJECTS\"\n\nfunction gate_hook {\n bash\ - \ -xe $BASE/new/networking-bagpipe/devstack/gate_hook.sh \n}\nexport -f\ - \ gate_hook\n\nexport DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-bagpipe/devstack/devstack-gate-rc\n\ - \ncp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh\n\ - ./safe-devstack-vm-gate-wrap.sh\n" - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/tempest-dsvm-networking-bgpvpn-bagpipe/post.yaml b/playbooks/legacy/tempest-dsvm-networking-bgpvpn-bagpipe/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-bgpvpn-bagpipe/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-networking-bgpvpn-bagpipe/run.yaml b/playbooks/legacy/tempest-dsvm-networking-bgpvpn-bagpipe/run.yaml deleted file mode 100644 index fd5b0bca..00000000 --- a/playbooks/legacy/tempest-dsvm-networking-bgpvpn-bagpipe/run.yaml +++ /dev/null @@ -1,83 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-networking-bgpvpn-bagpipe from old job - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial - 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 - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin networking-bgpvpn https://opendev.org/openstack/networking-bgpvpn - TEMPEST_PLUGINS='/opt/stack/new/networking-bgpvpn' - - 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_NEUTRON=1 - # Make sure tempest is installed and performed - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=0 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - # 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-bgpvpn $PROJECTS" - export PROJECTS="openstack/networking-bagpipe $PROJECTS" - - # Keep localrc to be able to set some vars in pre_test_hook - export KEEP_LOCALRC=1 - - function pre_test_hook { - . $BASE/new/networking-bgpvpn/devstack/pre_test_hook.sh dsvm-tempest - } - export -f pre_test_hook - - function gate_hook { - . $BASE/new/networking-bgpvpn/devstack/gate_hook.sh dsvm-tempest - } - export -f gate_hook - - function post_test_hook { - . $BASE/new/networking-bgpvpn/devstack/post_test_hook.sh dsvm-tempest - } - export -f post_test_hook - - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-bgpvpn/devstack/devstack-gate-bagpipe-rc - 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 6734dae0..885f72ba 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -249,18 +249,6 @@ run: playbooks/legacy/monasca-thresh-maven-build/run.yaml timeout: 1800 -- job: - name: legacy-networking-bagpipe-dsvm-fullstack - parent: legacy-dsvm-base - run: playbooks/legacy/networking-bagpipe-dsvm-fullstack/run.yaml - post-run: playbooks/legacy/networking-bagpipe-dsvm-fullstack/post.yaml - timeout: 7800 - required-projects: - - openstack/devstack-gate - - openstack/networking-bagpipe - - openstack/networking-bgpvpn - - openstack/networking-sfc - - job: name: legacy-neutron-dsvm-api-pecan parent: legacy-dsvm-base @@ -542,30 +530,6 @@ - openstack/tempest nodeset: legacy-ubuntu-xenial-2-node -- job: - name: legacy-tempest-dsvm-networking-bagpipe - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-networking-bagpipe/run.yaml - post-run: playbooks/legacy/tempest-dsvm-networking-bagpipe/post.yaml - timeout: 7800 - required-projects: - - openstack/devstack-gate - - openstack/networking-bagpipe - - openstack/networking-bgpvpn - - openstack/tempest - -- job: - name: legacy-tempest-dsvm-networking-bgpvpn-bagpipe - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-networking-bgpvpn-bagpipe/run.yaml - post-run: playbooks/legacy/tempest-dsvm-networking-bgpvpn-bagpipe/post.yaml - timeout: 7800 - required-projects: - - openstack/devstack-gate - - openstack/networking-bagpipe - - openstack/networking-bgpvpn - - openstack/tempest - - job: name: legacy-tempest-dsvm-neutron-dvr-multinode-full parent: legacy-dsvm-base-multinode