Merge "Move master undercloud/standalone/overcloud upgrade jobs deprecated"

zuul.d/deprecated-jobs.yaml

@@ -162,3 +162,59 @@
           - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
         tempest_private_net_provider_type: 'vxlan'
         use_os_tempest: true
+
+- job:
+    name: tripleo-ci-centos-8-standalone-upgrade
+    parent: tripleo-ci-base-standalone-upgrade-centos-8
+    voting: false
+    branches: ^master$
+    vars:
+      featureset: '056'
+      featureset_override:
+        standalone_environment_files:
+          - 'environments/low-memory-usage.yaml'
+          - 'environments/docker-ha.yaml'
+          - 'environments/podman.yaml'
+    irrelevant-files:
+      - .*molecule.*
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^Puppetfile.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^lower-constraints.txt$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^spec/.*$
+      - ^test-requirements.txt$
+      - ^vars/sova-patterns.yml$
+      - tox.ini
+      - zuul.d/ansible.yaml
+      - zuul.d/build-containers.yaml
+      - zuul.d/build-image.yaml
+      - zuul.d/multinode-jobs.yaml
+      - zuul.d/undercloud-jobs.yaml
+      # like parent but with requirements.txt and setup.py removed
+
+- job:
+    name: tripleo-ci-centos-8-undercloud-upgrade
+    parent: tripleo-ci-base-singlenode-centos-8
+    branches: ^master$
+    voting: false
+    vars:
+      featureset: '050'
+      featureset_override:
+        validate_services: false
+      extra_tags:
+        - undercloud-upgrade
+
+- job:
+    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades
+    parent: tripleo-ci-base-multinode-centos-8
+    voting: false
+    branches: ^master$
+    vars:
+      nodes: 1ctlr
+      featureset: '051'
+      extra_tags:
+        - overcloud-upgrade

zuul.d/multinode-jobs.yaml

@@ -51,8 +51,6 @@
             irrelevant-files: *multinode_ignored
         - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train:
             irrelevant-files: *multinode_ignored
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades:
-            irrelevant-files: *multinode_ignored
         - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
             irrelevant-files: *multinode_ignored
         - tripleo-ci-centos-8-standalone:
@@ -139,8 +137,6 @@
             irrelevant-files: *multinode_ignored
         - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train:
             irrelevant-files: *multinode_ignored
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades:
-            irrelevant-files: *multinode_ignored
         - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri:
             irrelevant-files: *multinode_ignored
         - tripleo-ci-centos-7-standalone:
@@ -691,17 +687,6 @@
       nodes: 1ctlr
       featureset: '044'
 
-- job:
-    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades
-    parent: tripleo-ci-base-multinode-centos-8
-    voting: false
-    branches: ^master$
-    vars:
-      nodes: 1ctlr
-      featureset: '051'
-      extra_tags:
-        - overcloud-upgrade
-
 - job:
     name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri
     parent: tripleo-ci-base-multinode-centos-8

zuul.d/standalone-jobs.yaml

@@ -93,10 +93,10 @@
       - tox.ini
 
 - job:
-    name: tripleo-ci-centos-8-standalone-upgrade
+    name: tripleo-ci-centos-8-standalone-upgrade-victoria
     parent: tripleo-ci-base-standalone-upgrade-centos-8
-    voting: false
-    branches: ^master$
+    voting: true
+    branches: ^stable/victoria$
     vars:
       featureset: '056'
       featureset_override:
@@ -126,18 +126,6 @@
       # like parent but with requirements.txt and setup.py removed
 
 
-- job:
-    name: tripleo-ci-centos-8-standalone-upgrade-victoria
-    parent: tripleo-ci-base-standalone-upgrade-centos-8
-    voting: true
-    branches: ^stable/victoria$
-    vars:
-      featureset: '056'
-      featureset_override:
-        standalone_environment_files:
-          - 'environments/low-memory-usage.yaml'
-    irrelevant-files: *upgrade_irrelevant
-
 # docker-ha, podman env files https://bugs.launchpad.net/tripleo/+bug/1887159
 - job:
     name: tripleo-ci-centos-8-standalone-upgrade-ussuri
@@ -363,7 +351,6 @@
               # puppet-tripleo
               - ^manifests/haproxy.*$
         - tripleo-ci-centos-7-standalone-rocky
-        - tripleo-ci-centos-8-standalone-upgrade
         - tripleo-ci-centos-8-standalone-upgrade-ussuri
         - tripleo-ci-centos-8-standalone
         - tripleo-ci-centos-8-standalone-build

zuul.d/undercloud-jobs.yaml

@@ -35,8 +35,6 @@
 
         - tripleo-ci-centos-8-undercloud-containers:
             irrelevant-files: *undercloud_ignored
-        - tripleo-ci-centos-8-undercloud-upgrade:
-            irrelevant-files: *undercloud_ignored
         - tripleo-ci-centos-8-undercloud-upgrade-ussuri:
             irrelevant-files: *undercloud_ignored
     gate:
@@ -139,18 +137,6 @@
         - multinode-undercloud.yml
         - multinode-validate.yml
 
-- job:
-    name: tripleo-ci-centos-8-undercloud-upgrade
-    parent: tripleo-ci-base-singlenode-centos-8
-    branches: ^master$
-    voting: false
-    vars:
-      featureset: '050'
-      featureset_override:
-        validate_services: false
-      extra_tags:
-        - undercloud-upgrade
-
 - job:
     name: tripleo-ci-centos-8-undercloud-upgrade-ussuri
     parent: tripleo-ci-base-singlenode-centos-8

zuul.d/upgrades-jobs-templates.yaml

@@ -6,44 +6,6 @@
     check:
       jobs:
         - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-content-provider-victoria
-        - tripleo-ci-centos-8-standalone-upgrade:
-            vars: &consumer_vars
-              consumer_job: true
-              build_container_images: false
-              remove_tags:
-                - build
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-              - tripleo-ci-centos-8-content-provider-victoria
-        - tripleo-ci-centos-8-undercloud-upgrade:
-            vars: *consumer_vars
-            irrelevant-files: &undercloud_ignored
-              - ^.*\.md$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^docs/.*$
-              - ^etc/.*$
-              - ^metadata.json$
-              - ^releasenotes/.*$
-              - ^test-requirements.txt$
-              - ^spec/.*$
-              - ^Puppetfile.*$
-              - tox.ini
-              - ^roles/build-containers/.*$
-              - ^roles/oooci-build-images/.*$
-              - ^playbooks/deprecated/.*$
-              - ^playbooks/tripleo-buildcontainers/.*$
-              - ^playbooks/tripleo-buildimages/.*$
-              - ^vars/sova-patterns.yml$
-              - zuul.d/layout.yaml
-              - zuul.d/build-containers.yaml
-              - zuul.d/build-image.yaml
-              - zuul.d/standalone-jobs.yaml
-              - zuul.d/multinode-jobs.yaml
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-              - tripleo-ci-centos-8-content-provider-victoria
         - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates:
             irrelevant-files: &multinode_ignored
               - ^.*\.md$
@@ -72,12 +34,11 @@
               - playbooks/quickstart-extras-standalone.yml
               - roles/standalone/.*
               - roles/standalone-upgrade/.*
-            vars: *consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades:
-            irrelevant-files: *multinode_ignored
-            vars: *consumer_vars
+            vars: &consumer_vars
+              consumer_job: true
+              build_container_images: false
+              remove_tags:
+                - build
             dependencies:
               - tripleo-ci-centos-8-content-provider
     gate:
@@ -103,7 +64,29 @@
               - tripleo-ci-centos-8-content-provider-ussuri
         - tripleo-ci-centos-8-undercloud-upgrade-victoria:
             vars: *consumer_vars
-            irrelevant-files: *undercloud_ignored
+            irrelevant-files: &undercloud_ignored
+              - ^.*\.md$
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^docs/.*$
+              - ^etc/.*$
+              - ^metadata.json$
+              - ^releasenotes/.*$
+              - ^test-requirements.txt$
+              - ^spec/.*$
+              - ^Puppetfile.*$
+              - tox.ini
+              - ^roles/build-containers/.*$
+              - ^roles/oooci-build-images/.*$
+              - ^playbooks/deprecated/.*$
+              - ^playbooks/tripleo-buildcontainers/.*$
+              - ^playbooks/tripleo-buildimages/.*$
+              - ^vars/sova-patterns.yml$
+              - zuul.d/layout.yaml
+              - zuul.d/build-containers.yaml
+              - zuul.d/build-image.yaml
+              - zuul.d/standalone-jobs.yaml
+              - zuul.d/multinode-jobs.yaml
             dependencies:
               - tripleo-ci-centos-8-content-provider
               - tripleo-ci-centos-8-content-provider-ussuri