From 82d28a6895738ae66bcc3c9e86bbf4ac6ba366f3 Mon Sep 17 00:00:00 2001 From: Elod Illes Date: Fri, 7 Jul 2023 14:23:37 +0200 Subject: [PATCH] Cleanup orphan jobs after stable/train EOL of nova These jobs were used only in nova's stable/train, but that went to EOL, so job definitions can be removed from here. Change-Id: Ib6005dcd7eefbe693a400ef016103ed1df064d83 --- .../post.yaml | 15 ----- .../run.yaml | 52 ---------------- .../post.yaml | 15 ----- .../run.yaml | 59 ------------------- zuul.d/zuul-legacy-jobs.yaml | 23 -------- 5 files changed, 164 deletions(-) delete mode 100644 playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/post.yaml delete mode 100644 playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/run.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-nova-libvirt-kvm-apr/post.yaml delete mode 100644 playbooks/legacy/tempest-dsvm-nova-libvirt-kvm-apr/run.yaml diff --git a/playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/post.yaml b/playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/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-neutron-multinode-zero-downtime/run.yaml b/playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/run.yaml deleted file mode 100644 index d83ce1c2..00000000 --- a/playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/run.yaml +++ /dev/null @@ -1,52 +0,0 @@ -- hosts: primary - name: Autoconverted job legacy-grenade-dsvm-neutron-multinode-zero-downtime from - old job gate-grenade-dsvm-neutron-multinode-zero-downtime-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 - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_CONFIGDRIVE=0 - export DEVSTACK_GATE_GRENADE=pullup - export DEVSTACK_GATE_USE_PYTHON3=False - export PROJECTS="openstack/grenade $PROJECTS" - # Default to non DVR - export DEVSTACK_GATE_NEUTRON_DVR=0 - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_GATE_TOPOLOGY="multinode" - function post_test_hook { - /opt/stack/new/nova/nova/tests/zero_downtime/hooks/run_tests.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/playbooks/legacy/tempest-dsvm-nova-libvirt-kvm-apr/post.yaml b/playbooks/legacy/tempest-dsvm-nova-libvirt-kvm-apr/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/tempest-dsvm-nova-libvirt-kvm-apr/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-nova-libvirt-kvm-apr/run.yaml b/playbooks/legacy/tempest-dsvm-nova-libvirt-kvm-apr/run.yaml deleted file mode 100644 index 65b34a86..00000000 --- a/playbooks/legacy/tempest-dsvm-nova-libvirt-kvm-apr/run.yaml +++ /dev/null @@ -1,59 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-tempest-dsvm-nova-libvirt-kvm-apr from old job gate-tempest-dsvm-nova-libvirt-kvm-apr-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 devstack-plugin-additional-pkg-repos https://opendev.org/x/devstack-plugin-additional-pkg-repos - - 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_FULL=1 - export PROJECTS="x/devstack-plugin-additional-pkg-repos $PROJECTS" - # We want to test the latest libvirt with kvm version with that plugin - # TODO: (markus_z) rename that in the apr repo to "libvirt-kvm" - # to make the chosen virtualization technology explicit. - export LATEST_CODEBASES=libvirt - 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 6734dae0..fa5dbe39 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -104,17 +104,6 @@ - openstack/devstack-gate - openstack/neutron -- job: - name: legacy-grenade-dsvm-neutron-multinode-zero-downtime - parent: legacy-dsvm-base-multinode - run: playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/run.yaml - post-run: playbooks/legacy/grenade-dsvm-neutron-multinode-zero-downtime/post.yaml - timeout: 10800 - required-projects: - - openstack/grenade - - openstack/devstack-gate - - openstack/neutron - - job: name: legacy-group-based-policy-dsvm-aim parent: legacy-dsvm-base @@ -673,18 +662,6 @@ - openstack/neutron - openstack/tempest -- job: - name: legacy-tempest-dsvm-nova-libvirt-kvm-apr - parent: legacy-dsvm-base - run: playbooks/legacy/tempest-dsvm-nova-libvirt-kvm-apr/run.yaml - post-run: playbooks/legacy/tempest-dsvm-nova-libvirt-kvm-apr/post.yaml - timeout: 10800 - required-projects: - - openstack/devstack-gate - - x/devstack-plugin-additional-pkg-repos - - openstack/nova - - openstack/tempest - - job: name: legacy-tempest-dsvm-nova-v20-api parent: legacy-dsvm-base