Merge "Victoria tear down : multinode and undercloud jobs"

zuul.d/deprecated-jobs.yaml

@@ -348,6 +348,18 @@
     vars:
       branch_override: stable/ussuri
 
+# TODO(pojadhav) used by openstack/puppet-tripleo on stable/train
+# https://review.opendev.org/c/openstack/tripleo-ci/+/853931/8#message-546978d64c7dad6cadca89ba5c5395629fddb392
+- job:
+    name: tripleo-ci-centos-8-scenario007-multinode-oooq-container
+    parent: tripleo-ci-base-multinode-centos-8
+    branches: &c8_branches ^(stable/train).*$
+    vars:
+      nodes: 1ctlr
+      featureset: '030'
+      playbooks:
+        - multinode.yml
+
 # TODO(marios) used by openstack/manila on stable/stein
 # https://review.opendev.org/c/openstack/tripleo-ci/+/838110/10#message-68c2e8290269a5fdceb4c122e57a563a54d68839
 - job:
@@ -393,6 +405,7 @@
 
 - project-template:
     name: tripleo-multinode-container-minimal
+    queue: tripleo
     check:
       jobs:
         - tripleo-ci-centos-8-containers-multinode:
@@ -478,6 +491,7 @@
 
 - project-template:
     name: tripleo-multinode-container-full
+    queue: tripleo
     check:
       jobs:
         - tripleo-ci-centos-8-containers-multinode:
@@ -556,6 +570,7 @@
 #
 - project-template:
     name: tripleo-standalone-scenarios-full
+    queue: tripleo
     check:
       jobs:
         - tripleo-ci-centos-8-scenario001-standalone:
@@ -786,6 +801,7 @@
 #
 - project-template:
     name: tripleo-undercloud-jobs
+    queue: tripleo
     check:
       jobs:
         - tripleo-ci-centos-7-undercloud-oooq:

zuul.d/multinode-jobs.yaml

@@ -182,11 +182,6 @@
             vars: *multi_consumer_vars
             dependencies:
               - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-scenario007-multinode-oooq-container:
-            irrelevant-files: *multinode_ignored
-            vars: *multi_consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
         - tripleo-ci-centos-8-containers-undercloud-minion:
             irrelevant-files: *multinode_ignored
             vars: *multi_consumer_vars
@@ -207,11 +202,6 @@
             vars: *multi_consumer_vars
             dependencies:
               - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-scenario007-multinode-oooq-container:
-            irrelevant-files: *multinode_ignored
-            vars: *multi_consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
         - tripleo-ci-centos-8-containers-undercloud-minion:
             irrelevant-files: *multinode_ignored
             vars: *multi_consumer_vars
@@ -279,7 +269,7 @@
 - job:
     name: tripleo-ci-centos-9-containers-multinode
     parent: tripleo-ci-base-multinode-centos-9
-    branches: &c9_branches ^(?!stable/(train|victoria)).*$
+    branches: &c9_branches ^(?!stable/train).*$
     irrelevant-files: *multinode_ignored
     voting: true
 
@@ -311,7 +301,7 @@
 - job:
     name: tripleo-ci-centos-8-containers-multinode
     parent: tripleo-ci-base-multinode-centos-8
-    branches: &c8_branches ^(stable/(train|victoria)).*$
+    branches: &c8_branches ^(stable/train).*$
     voting: true
 
 - job:
@@ -340,14 +330,6 @@
     vars:
       branch_override: stable/wallaby
 
-- job:
-    name: tripleo-ci-centos-8-containers-multinode-victoria
-    parent: tripleo-ci-centos-8-containers-multinode
-    branches: master
-    override-checkout: stable/victoria
-    vars:
-      branch_override: stable/victoria
-
 - job:
     name: tripleo-ci-centos-8-containers-multinode-train
     parent: tripleo-ci-centos-8-containers-multinode
@@ -356,16 +338,6 @@
     vars:
       branch_override: stable/train
 
-- job:
-    name: tripleo-ci-centos-8-scenario007-multinode-oooq-container
-    parent: tripleo-ci-base-multinode-centos-8
-    branches: stable/victoria
-    vars:
-      nodes: 1ctlr
-      featureset: '030'
-      playbooks:
-        - multinode.yml
-
 ## Centos 8 9 mixed deployment
 - job:
     name: tripleo-ci-centos-8-9-multinode-mixed-os

zuul.d/periodic.yaml

@@ -41,9 +41,6 @@
         - tripleo-ci-centos-9-content-provider-wallaby:
             vars:
               force_non_periodic: true
-        - tripleo-ci-centos-8-content-provider-victoria:
-            vars:
-              force_non_periodic: true
         - tripleo-ci-centos-8-content-provider-train:
             vars:
               force_non_periodic: true
@@ -56,10 +53,6 @@
                 - build
             dependencies:
               - tripleo-ci-centos-9-content-provider-wallaby
-        - tripleo-ci-centos-8-containers-multinode-victoria:
-            vars: *multi_consumer_vars_periodic
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-victoria
         - tripleo-ci-centos-8-containers-multinode-train:
             vars: *multi_consumer_vars_periodic
             dependencies:

zuul.d/undercloud-jobs.yaml

@@ -105,7 +105,7 @@
 - job:
     name: tripleo-ci-centos-8-undercloud-containers
     parent: tripleo-ci-base-undercloud-centos-8
-    branches: ^(stable/(train|victoria)).*$
+    branches: ^(stable/train).*$
     voting: true
     vars: &undercloud_job_vars
       featureset: '027'
@@ -117,6 +117,6 @@
 - job:
     name: tripleo-ci-centos-9-undercloud-containers
     parent: tripleo-ci-base-undercloud-centos-9
-    branches: ^(?!stable/(train|victoria)).*$
+    branches: ^(?!stable/train).*$
     irrelevant-files: *undercloud_ignored
     vars: *undercloud_job_vars