Remove Train check/gate jobs

There are no longer imports from the train branch. This review remove Train from check/gate templates. Change-Id: Ie24ab5b5b16d8a6af4f7d37483367f60265ee1ab
2023-09-10 21:52:47 -04:00 · 2023-09-10 21:52:47 -04:00 · f7381ebd2b
parent 65d2358303
commit f7381ebd2b
5 changed files with 33 additions and 166 deletions
--- a/zuul.d/build-image.yaml
+++ b/zuul.d/build-image.yaml
@ -69,7 +69,7 @@
    name: tripleo-ci-buildimage-jobs
    check:
      jobs:
-        - tripleo-buildimage-overcloud-full-centos-8:
+        - tripleo-buildimage-overcloud-full-centos-9:
            files: &build_images_files
              - ^playbooks/tripleo-buildimages/.*$
              - ^roles/oooci-build-images/.*$
@ -77,26 +77,10 @@
              - tripleoclient/v1/overcloud_image.py
              - elements/.*
              - ^image-yaml/.*
-        - tripleo-buildimage-overcloud-full-centos-8-train:
-            files: *build_images_files
-        - tripleo-buildimage-ironic-python-agent-centos-8:
-            files: *build_images_files
-        - tripleo-buildimage-ironic-python-agent-centos-8-train:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-hardened-full-centos-8-train:
-            files: &build_images_hardened_files
-              - ^image-yaml/.*hardened.*
-              - ^elements/overcloud-secure
-              - ^elements/overcloud-partition
-              - ^diskimage_builder/elements/modprobe
        - tripleo-buildimage-overcloud-full-centos-9:
            files: *build_images_files
        - tripleo-buildimage-ironic-python-agent-centos-9:
            files: *build_images_files
-        - tripleo-buildimage-ironic-python-agent-centos-9-zed:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-full-centos-9-zed:
-            files: *build_images_files
        - tripleo-buildimage-overcloud-hardened-uefi-full-centos-9:
            files: &build_images_hardened_uefi_files
              - ^image-yaml/.*hardened-images-uefi.*
@ -106,41 +90,19 @@
              - ^diskimage_builder/elements/bootloader
              - ^diskimage_builder/elements/growvols
              - ^roles/oooci-build-images/.*$
-        - tripleo-buildimage-overcloud-hardened-uefi-full-centos-9-zed:
-            files: *build_images_hardened_uefi_files
    gate:
      jobs:
-        - tripleo-buildimage-overcloud-full-centos-8:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-full-centos-8-train:
-            files: *build_images_files
-        - tripleo-buildimage-ironic-python-agent-centos-8:
-            files: *build_images_files
-        - tripleo-buildimage-ironic-python-agent-centos-8-train:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-hardened-full-centos-8-train:
-            files: *build_images_hardened_files
        - tripleo-buildimage-overcloud-full-centos-9:
            files: *build_images_files
        - tripleo-buildimage-ironic-python-agent-centos-9:
            files: *build_images_files
-        - tripleo-buildimage-ironic-python-agent-centos-9-zed:
-            files: *build_images_files
-        - tripleo-buildimage-overcloud-full-centos-9-zed:
-            files: *build_images_files
        - tripleo-buildimage-overcloud-hardened-uefi-full-centos-9:
            files: *build_images_hardened_uefi_files
-        - tripleo-buildimage-overcloud-hardened-uefi-full-centos-9-zed:
-            files: *build_images_hardened_uefi_files

 - project-template:
    name: tripleo-buildimage-jobs
    check:
      jobs:
-        - tripleo-buildimage-overcloud-full-centos-8:
-            files: *build_images_files
-        - tripleo-buildimage-ironic-python-agent-centos-8:
-            files: *build_images_files
        - tripleo-buildimage-overcloud-full-centos-9:
            files: *build_images_files
        - tripleo-buildimage-ironic-python-agent-centos-9:
@ -149,10 +111,6 @@
            files: *build_images_hardened_uefi_files
    gate:
      jobs:
-        - tripleo-buildimage-overcloud-full-centos-8:
-            files: *build_images_files
-        - tripleo-buildimage-ironic-python-agent-centos-8:
-            files: *build_images_files
        - tripleo-buildimage-overcloud-full-centos-9:
            files: *build_images_files
        - tripleo-buildimage-ironic-python-agent-centos-9:
@ -183,7 +141,7 @@
 - job:
    name: tripleo-buildimage-ironic-python-agent-centos-9
    parent: tripleo-build-images-base-centos-9
-    branches: &c9_branches ^(?!stable/train).*$
+    branches: &c9_branches ^(stable/wallaby).*$
    vars:
      tripleo_image_type: ironic-python-agent
    irrelevant-files: &build_image_irrelevant
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@ -72,7 +72,7 @@
      jobs:
        - tripleo-ci-centos-9-content-provider
        - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-containers-multinode:
+        - tripleo-ci-centos-9-containers-multinode:
            irrelevant-files: &multinode_ignored
              - .*molecule.*
              - ^.*\.md$
@ -143,11 +143,6 @@
              build_container_images: false
              remove_tags:
                - build
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-9-containers-multinode: &cs9_multinode_all
-            irrelevant-files: *multinode_ignored
-            vars: *multi_consumer_vars
            dependencies:
              - tripleo-ci-centos-9-content-provider
        - tripleo-ci-centos-8-9-multinode-mixed-os: &multinode_mixed_os
@ -156,18 +151,17 @@
            dependencies:
              - tripleo-ci-centos-8-content-provider
              - tripleo-ci-centos-9-content-provider
-        - tripleo-ci-centos-9-scenario007-multinode-oooq-container: *cs9_multinode_all
+        - tripleo-ci-centos-9-scenario007-multinode-oooq-container: &cs9_multinode_all
+            irrelevant-files: *multinode_ignored
+            vars: *multi_consumer_vars
+            dependencies:
+              - tripleo-ci-centos-9-content-provider
    gate:
      jobs:
        - tripleo-ci-centos-9-content-provider
        - tripleo-ci-centos-8-content-provider
        - tripleo-ci-centos-9-containers-multinode: *cs9_multinode_all
        - tripleo-ci-centos-8-9-multinode-mixed-os: *multinode_mixed_os
-        - tripleo-ci-centos-8-containers-multinode:
-            irrelevant-files: *multinode_ignored
-            vars: *multi_consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider

 - project-template:
    name: tripleo-multinode-container-full-pipeline
@ -242,29 +236,17 @@
              - ^tripleo_common/tests/.*$
            dependencies:
              - openstack-tox-linters
-        - tripleo-ci-centos-8-content-provider-train:
-            irrelevant-files: *branchful_ignored
-            dependencies:
-              - openstack-tox-linters
        - tripleo-ci-centos-9-containers-multinode-wallaby: &multi_consumer_job_wallaby
            irrelevant-files: *branchful_ignored
            vars: *multi_consumer_vars
            dependencies:
              - tripleo-ci-centos-9-content-provider-wallaby
-        - tripleo-ci-centos-8-containers-multinode-train: &multi_consumer_job_train
-            irrelevant-files: *branchful_ignored
-            vars: *multi_consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-train

    gate:
      jobs:
        - tripleo-ci-centos-9-content-provider-wallaby:
            irrelevant-files: *branchful_ignored
-        - tripleo-ci-centos-8-content-provider-train:
-            irrelevant-files: *branchful_ignored
        - tripleo-ci-centos-9-containers-multinode-wallaby: *multi_consumer_job_wallaby
-        - tripleo-ci-centos-8-containers-multinode-train: *multi_consumer_job_train

 ## CentOS 9 jobs
 - job:
--- a/zuul.d/periodic.yaml
+++ b/zuul.d/periodic.yaml
@ -56,9 +56,6 @@
        - tripleo-ci-centos-9-content-provider-wallaby:
            vars:
              force_non_periodic: true
-        - tripleo-ci-centos-8-content-provider-train:
-            vars:
-              force_non_periodic: true
        - tripleo-ci-centos-9-containers-multinode-wallaby:
            vars: &multi_consumer_vars_periodic
              force_non_periodic: true
@ -68,10 +65,6 @@
                - build
            dependencies:
              - tripleo-ci-centos-9-content-provider-wallaby
-        - tripleo-ci-centos-8-containers-multinode-train:
-            vars: *multi_consumer_vars_periodic
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-train

 - project-template:
    name: tripleo-periodic-upgrades-master-pipeline
@ -176,7 +169,6 @@
      jobs:
        - tripleo-ci-centos-9-content-provider-wallaby: *force_non_periodic
        - tripleo-ci-centos-8-content-provider-wallaby: *force_non_periodic
-        - tripleo-ci-centos-8-content-provider-train: *force_non_periodic
        - tripleo-ci-centos-9-content-provider-current-wallaby: *force_non_periodic
        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates:
            irrelevant-files: *multinode_ignored
@ -184,12 +176,6 @@
            dependencies:
              - tripleo-ci-centos-9-content-provider-wallaby
              - tripleo-ci-centos-9-content-provider-current-wallaby
-        - tripleo-ci-centos-8-undercloud-ffu-wallaby:
-            vars: *consumer_vars
-            irrelevant-files: *undercloud_ignored
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-wallaby
-              - tripleo-ci-centos-8-content-provider-train

 - project-template:
    name: tripleo-ceph-periodic-wallaby
--- a/zuul.d/standalone-jobs.yaml
+++ b/zuul.d/standalone-jobs.yaml
@ -57,7 +57,7 @@
 - job:
    name: tripleo-ci-centos-8-standalone
    parent: tripleo-ci-base-standalone-centos-8
-    branches: ^(stable/(train|wallaby)).*$
+    branches: ^(stable/(wallaby)).*$
    vars:
      featureset: '052'
    irrelevant-files: &irrelevant_files
@ -83,7 +83,7 @@
 - job:
    name: tripleo-ci-centos-9-standalone
    parent: tripleo-ci-base-standalone-centos-9
-    branches: &c9_branches ^(?!stable/train).*$
+    branches: &c9_branches ^(stable/wallaby).*$
    vars:
      containers_base_image: registry.access.redhat.com/ubi9:latest
      featureset: '052'
@ -115,12 +115,10 @@
    queue: tripleo
    check:
      jobs:
-        - tripleo-ci-centos-8-content-provider:
-            irrelevant-files: *irrelevant_files
        - tripleo-ci-centos-9-content-provider:
            irrelevant-files: *irrelevant_files
-        - tripleo-ci-centos-8-scenario001-standalone: &c8_scen1
-            branches: &c8_branches ^(stable/train).*$
+        - tripleo-ci-centos-9-scenario001-standalone: &c9_scen1
+            branches: *c9_branches
            files: &scen1_files
              # tripleo-common
              - ^container-images/tcib/base/collectd.*$
@ -195,9 +193,9 @@
              remove_tags:
                - build
            dependencies:
-              - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-scenario002-standalone: &c8_scen2
-            <<: *c8_scen1
+              - tripleo-ci-centos-9-content-provider
+        - tripleo-ci-centos-9-scenario002-standalone: &c9_scen2
+            <<: *c9_scen1
            files: &scen2_files
              # tripleo-heat-templates
              - ^((docker|puppet)/services|deployment)/.*aodh.*$
@ -232,8 +230,8 @@
              - ^tripleo_ansible/roles/tripleo_hieradata/.*
              - ^tripleo_ansible/roles/tripleo_upgrade_hiera/.*
              - ^tripleo_ansible/roles/tripleo_lvmfilter/.*
-        - tripleo-ci-centos-8-scenario003-standalone: &c8_scen3
-            <<: *c8_scen1
+        - tripleo-ci-centos-9-scenario003-standalone: &c9_scen3
+            <<: *c9_scen1
            files: &scen3_files
              # tripleo-common
              - ^container-images/tcib/base/os/designate.*$
@ -260,8 +258,8 @@
              - ^tripleo_ansible/roles/tripleo_unbound/.*
              - ^tripleo_ansible/roles/.*designate.*$
              - ^tripleo_ansible/ansible_plugins/modules/tripleo_findif_for_ip.py
-        - tripleo-ci-centos-8-scenario004-standalone: &c8_scen4
-            <<: *c8_scen1
+        - tripleo-ci-centos-9-scenario004-standalone: &c9_scen4
+            <<: *c9_scen1
            files: &scen4_files
              # tripleo-common
              - ^container-images/tcib/base/os/horizon.*$
@ -285,8 +283,8 @@
              - ^tripleo_ansible/roles/tripleo_ceph.*/.*
              # tripleo-quickstart-extras (including standalone ceph)
              - roles/standalone/tasks/.*
-        - tripleo-ci-centos-8-scenario007-standalone: &c8_scen7
-            <<: *c8_scen1
+        - tripleo-ci-centos-9-scenario007-standalone: &c9_scen7
+            <<: *c9_scen1
            files: &scen7_files
              # tripleo-common
              - ^container-images/tcib/base/os/neutron.*$
@ -296,9 +294,9 @@
              - ci/environments/scenario007-standalone.yaml
              # puppet-tripleo
              - ^manifests/haproxy.*$
-        - tripleo-ci-centos-8-scenario010-standalone-train: &c8_scen10_train
-            <<: *c8_scen1
-            branches: stable/train
+        - tripleo-ci-centos-9-scenario010-standalone: &c9_scen10
+            <<: *c9_scen1
+            branches: stable/wallaby
            files: &scen10_files
              # tripleo-common
              - ^container-images/tcib/base/os/horizon.*$
@ -331,9 +329,9 @@
              # tripleo-ansible
              - ^tripleo_ansible/roles/octavia_.*/.*
              - ^tripleo_ansible/playbooks/octavia.*$
-        - tripleo-ci-centos-8-scenario010-ovn-provider-standalone-train: *c8_scen10_train
-        - tripleo-ci-centos-8-scenario012-standalone: &c8_scen12
-            <<: *c8_scen1
+        - tripleo-ci-centos-9-scenario010-ovn-provider-standalone: *c9_scen10
+        - tripleo-ci-centos-9-scenario012-standalone: &c9_scen12
+            <<: *c9_scen1
            files: &scen12_files
              # tripleo-heat-templates
              - ^(docker/services|deployment)/glance.*$
@ -346,63 +344,18 @@
              - ^manifests/haproxy.*$
              - ^manifests/profile/(base|pacemaker)/glance.*$
              - ^manifests/profile/(base|pacemaker)/ironic.*$
-        - tripleo-ci-centos-8-standalone:
-            vars: *consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-        # CentOS 9 jobs
        - tripleo-ci-centos-9-standalone: &cs9_vars
            vars: *consumer_vars
            dependencies:
              - tripleo-ci-centos-9-content-provider
-        - tripleo-ci-centos-9-scenario001-standalone: &c9_scen1
-            <<: *c8_scen1
-            branches: *c9_branches
-            dependencies:
-              - tripleo-ci-centos-9-content-provider
-        - tripleo-ci-centos-9-scenario002-standalone: &c9_scen2
-            <<: *c9_scen1
-            files: *scen2_files
-        - tripleo-ci-centos-9-scenario003-standalone: &c9_scen3
-            <<: *c9_scen1
-            files: *scen3_files
-        - tripleo-ci-centos-9-scenario004-standalone: &c9_scen4
-            <<: *c9_scen1
-            files: *scen4_files
-        - tripleo-ci-centos-9-scenario007-standalone: &c9_scen7
-            <<: *c9_scen1
-            files: *scen7_files
-        - tripleo-ci-centos-9-scenario010-standalone: &c9_scen10
-            <<: *c9_scen1
-            files: *scen10_files
-        - tripleo-ci-centos-9-scenario010-ovn-provider-standalone: *c9_scen10
-        - tripleo-ci-centos-9-scenario012-standalone: &c9_scen12
-            <<: *c9_scen1
-            files: *scen12_files
        - tripleo-ci-centos-9-standalone-fips:
            <<: *cs9_vars
            voting: false

    gate:
      jobs:
-        - tripleo-ci-centos-8-content-provider:
-            irrelevant-files: *irrelevant_files
        - tripleo-ci-centos-9-content-provider:
            irrelevant-files: *irrelevant_files
-        - tripleo-ci-centos-8-scenario001-standalone: *c8_scen1
-        - tripleo-ci-centos-8-scenario002-standalone: *c8_scen2
-        - tripleo-ci-centos-8-scenario003-standalone: *c8_scen3
-        - tripleo-ci-centos-8-scenario004-standalone: *c8_scen4
-        - tripleo-ci-centos-8-scenario007-standalone: *c8_scen7
-        - tripleo-ci-centos-8-scenario010-standalone-train: *c8_scen10_train
-        - tripleo-ci-centos-8-scenario010-ovn-provider-standalone-train: *c8_scen10_train
-        - tripleo-ci-centos-8-scenario012-standalone: *c8_scen12
-        - tripleo-ci-centos-8-standalone:
-            vars: *consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-        # CentOS 9 jobs
-        - tripleo-ci-centos-9-standalone: *cs9_vars
        - tripleo-ci-centos-9-scenario001-standalone: *c9_scen1
        - tripleo-ci-centos-9-scenario002-standalone: *c9_scen2
        - tripleo-ci-centos-9-scenario003-standalone: *c9_scen3
@ -411,6 +364,10 @@
        - tripleo-ci-centos-9-scenario010-standalone: *c9_scen10
        - tripleo-ci-centos-9-scenario010-ovn-provider-standalone: *c9_scen10
        - tripleo-ci-centos-9-scenario012-standalone: *c9_scen12
+        - tripleo-ci-centos-9-standalone:
+            vars: *consumer_vars
+            dependencies:
+              - tripleo-ci-centos-9-content-provider

 - job:
    name: tripleo-ci-scenario012-standalone-options
@ -431,7 +388,7 @@
    name: tripleo-ci-centos-8-scenario012-standalone
    voting: true
    parent: tripleo-ci-base-standalone-centos-8
-    branches: *c8_branches
+    branches: &c8_branches ^(stable/train).*$

 - job:
    name: tripleo-ci-centos-9-scenario012-standalone
--- a/zuul.d/upgrades-jobs-templates.yaml
+++ b/zuul.d/upgrades-jobs-templates.yaml
@ -149,29 +149,13 @@
        - tripleo-ci-centos-9-content-provider
        - tripleo-ci-centos-9-content-provider-current
        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: *cs9_update_all
-        - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-content-provider-train
-        - tripleo-ci-centos-8-undercloud-ffu-wallaby: &undercloud_ffu
-            vars: *consumer_vars
-            irrelevant-files: *undercloud_ignored
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-              - tripleo-ci-centos-8-content-provider-train
-        - tripleo-ci-centos-8-standalone-ffu-wallaby: &standalone_ffu
-            vars: *consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-              - tripleo-ci-centos-8-content-provider-train
    gate:
      jobs:
        - tripleo-ci-centos-9-content-provider
-        - tripleo-ci-centos-8-content-provider
        - tripleo-ci-centos-9-content-provider-current
-        - tripleo-ci-centos-8-content-provider-train
        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: *cs9_update_all
-        - tripleo-ci-centos-8-undercloud-ffu-wallaby: *undercloud_ffu
-        - tripleo-ci-centos-8-standalone-ffu-wallaby: *standalone_ffu

+# No reference to this on any branch used (past Train)
 - project-template:
    name: tripleo-upgrades-train-pipeline
    queue: tripleo