Moves upgrade and update jobs into the upgrades-jobs-templates.yaml

As part of [1] let's also tidy up the upgrade and update jobs. They
currently are defined in the various undercloud/multinode/standalone
templates. However now we have a dedicated upgrades jobs templates
file let's move the definitions there instead.

[1] https://review.opendev.org/q/topic:tripleo-ci-reduce

Change-Id: I1f7f0a1aa65e82f094abba1e2d8583ea04800e3b

zuul.d/multinode-jobs.yaml

@@ -172,64 +172,6 @@
       playbooks:
         - multinode.yml
 
-- job:
-    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates
-    description: |
-      Basic tripleo update job for centos-8, this is not an upgrade job.
-    parent: tripleo-ci-base-multinode-centos-8
-    voting: true
-    branches: ^master$
-    vars:
-      nodes: 1ctlr
-      featureset: '037'
-      # Note (dmsimard): This enforces a minimum TTL for DNS records, see
-      # https://review.opendev.org/#/c/523178/ for context
-      unbound_cache_min_ttl: 900
-      extra_tags:
-        - overcloud-update
-
-- job:
-    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-victoria
-    description: |
-      victoria tripleo minor update job for centos-8, this is not an upgrade job.
-    parent: tripleo-ci-base-multinode-centos-8
-    branches: ^stable/victoria$
-    voting: true
-    vars:
-      nodes: 1ctlr
-      featureset: '037'
-      unbound_cache_min_ttl: 900
-      extra_tags:
-        - overcloud-update
-
-- job:
-    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri
-    description: |
-      ussuri tripleo minor update job for centos-8, this is not an upgrade job.
-    parent: tripleo-ci-base-multinode-centos-8
-    branches: ^stable/ussuri$
-    voting: true
-    vars:
-      nodes: 1ctlr
-      featureset: '037'
-      unbound_cache_min_ttl: 900
-      extra_tags:
-        - overcloud-update
-
-- job:
-    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train
-    description: |
-      train tripleo minor update job for centos-8, this is not an upgrade job.
-    parent: tripleo-ci-base-multinode-centos-8
-    branches: ^stable/train$
-    voting: true
-    vars:
-      nodes: 1ctlr
-      featureset: '037'
-      unbound_cache_min_ttl: 900
-      extra_tags:
-        - overcloud-update
-
 - job:
     name: tripleo-ci-centos-8-containers-undercloud-minion
     parent: tripleo-ci-base-multinode-centos-8
@@ -344,29 +286,3 @@
     vars:
       nodes: 1ctlr
       featureset: '044'
-
-- job:
-    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri
-    parent: tripleo-ci-base-multinode-centos-8
-    voting: true
-    branches: ^stable/ussuri$
-    override-checkout: 'stable/ussuri'
-    vars:
-      branch_override: 'stable/ussuri'
-      nodes: 1ctlr
-      featureset: '051'
-      extra_tags:
-        - overcloud-upgrade
-
-- job:
-    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-victoria
-    parent: tripleo-ci-base-multinode-centos-8
-    voting: true
-    branches: ^stable/victoria$
-    override-checkout: 'stable/victoria'
-    vars:
-      branch_override: 'stable/victoria'
-      nodes: 1ctlr
-      featureset: '051'
-      extra_tags:
-        - overcloud-upgrade

zuul.d/standalone-jobs.yaml

@@ -92,54 +92,6 @@
       - ^vars/sova-patterns.yml$
       - tox.ini
 
-- 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'
-          - 'environments/docker-ha.yaml'
-          - 'environments/podman.yaml'
-    irrelevant-files: &upgrade_irrelevant
-      - .*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
-
-# docker-ha, podman env files https://bugs.launchpad.net/tripleo/+bug/1887159
-- job:
-    name: tripleo-ci-centos-8-standalone-upgrade-ussuri
-    parent: tripleo-ci-base-standalone-upgrade-centos-8
-    voting: true
-    branches: ^stable/ussuri$
-    vars:
-      featureset: '056'
-      featureset_override:
-        standalone_environment_files:
-          - 'environments/low-memory-usage.yaml'
-          - 'environments/docker-ha.yaml'
-          - 'environments/podman.yaml'
-    irrelevant-files: *upgrade_irrelevant
-
 - project-template:
     name: tripleo-standalone-scenarios-pipeline
     check:

zuul.d/undercloud-jobs.yaml

@@ -112,30 +112,6 @@
         - multinode-undercloud.yml
         - multinode-validate.yml
 
-- job:
-    name: tripleo-ci-centos-8-undercloud-upgrade-ussuri
-    parent: tripleo-ci-base-singlenode-centos-8
-    branches: ^stable/ussuri$
-    voting: true
-    vars:
-      featureset: '050'
-      featureset_override:
-        validate_services: false
-      extra_tags:
-        - undercloud-upgrade
-
-- job:
-    name: tripleo-ci-centos-8-undercloud-upgrade-victoria
-    parent: tripleo-ci-base-singlenode-centos-8
-    branches: ^stable/victoria$
-    voting: true
-    vars:
-      featureset: '050'
-      featureset_override:
-        validate_services: false
-      extra_tags:
-        - undercloud-upgrade
-
 - job:
     name: tripleo-ci-centos-7-content-provider-base
     parent: tripleo-ci-base-singlenode

zuul.d/upgrades-jobs-templates.yaml

@@ -200,3 +200,174 @@
             vars: *consumer_vars
             dependencies:
               - tripleo-ci-centos-8-content-provider
+
+#
+# Minor update jobs
+#
+
+- job:
+    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates
+    description: |
+      Basic tripleo update job for centos-8, this is not an upgrade job.
+    parent: tripleo-ci-base-multinode-centos-8
+    voting: true
+    branches: ^master$
+    vars:
+      nodes: 1ctlr
+      featureset: '037'
+      # Note (dmsimard): This enforces a minimum TTL for DNS records, see
+      # https://review.opendev.org/#/c/523178/ for context
+      unbound_cache_min_ttl: 900
+      extra_tags:
+        - overcloud-update
+
+- job:
+    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-victoria
+    description: |
+      victoria tripleo minor update job for centos-8, this is not an upgrade job.
+    parent: tripleo-ci-base-multinode-centos-8
+    branches: ^stable/victoria$
+    voting: true
+    vars:
+      nodes: 1ctlr
+      featureset: '037'
+      unbound_cache_min_ttl: 900
+      extra_tags:
+        - overcloud-update
+
+- job:
+    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-ussuri
+    description: |
+      ussuri tripleo minor update job for centos-8, this is not an upgrade job.
+    parent: tripleo-ci-base-multinode-centos-8
+    branches: ^stable/ussuri$
+    voting: true
+    vars:
+      nodes: 1ctlr
+      featureset: '037'
+      unbound_cache_min_ttl: 900
+      extra_tags:
+        - overcloud-update
+
+- job:
+    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-train
+    description: |
+      train tripleo minor update job for centos-8, this is not an upgrade job.
+    parent: tripleo-ci-base-multinode-centos-8
+    branches: ^stable/train$
+    voting: true
+    vars:
+      nodes: 1ctlr
+      featureset: '037'
+      unbound_cache_min_ttl: 900
+      extra_tags:
+        - overcloud-update
+
+#
+# Major Upgrade jobs
+#
+
+- job:
+    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-ussuri
+    parent: tripleo-ci-base-multinode-centos-8
+    voting: true
+    branches: ^stable/ussuri$
+    override-checkout: 'stable/ussuri'
+    vars:
+      branch_override: 'stable/ussuri'
+      nodes: 1ctlr
+      featureset: '051'
+      extra_tags:
+        - overcloud-upgrade
+
+- job:
+    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-upgrades-victoria
+    parent: tripleo-ci-base-multinode-centos-8
+    voting: true
+    branches: ^stable/victoria$
+    override-checkout: 'stable/victoria'
+    vars:
+      branch_override: 'stable/victoria'
+      nodes: 1ctlr
+      featureset: '051'
+      extra_tags:
+        - overcloud-upgrade
+
+#
+# Standalone upgrade jobs
+#
+
+- 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'
+          - 'environments/docker-ha.yaml'
+          - 'environments/podman.yaml'
+    irrelevant-files: &upgrade_irrelevant
+      - .*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
+
+# docker-ha, podman env files https://bugs.launchpad.net/tripleo/+bug/1887159
+- job:
+    name: tripleo-ci-centos-8-standalone-upgrade-ussuri
+    parent: tripleo-ci-base-standalone-upgrade-centos-8
+    voting: true
+    branches: ^stable/ussuri$
+    vars:
+      featureset: '056'
+      featureset_override:
+        standalone_environment_files:
+          - 'environments/low-memory-usage.yaml'
+          - 'environments/docker-ha.yaml'
+          - 'environments/podman.yaml'
+    irrelevant-files: *upgrade_irrelevant
+
+#
+# Undercloud upgrade jobs
+#
+- job:
+    name: tripleo-ci-centos-8-undercloud-upgrade-ussuri
+    parent: tripleo-ci-base-singlenode-centos-8
+    branches: ^stable/ussuri$
+    voting: true
+    vars:
+      featureset: '050'
+      featureset_override:
+        validate_services: false
+      extra_tags:
+        - undercloud-upgrade
+
+- job:
+    name: tripleo-ci-centos-8-undercloud-upgrade-victoria
+    parent: tripleo-ci-base-singlenode-centos-8
+    branches: ^stable/victoria$
+    voting: true
+    vars:
+      featureset: '050'
+      featureset_override:
+        validate_services: false
+      extra_tags:
+        - undercloud-upgrade