Merge "Victoria tear down : build image/container jobs"

roles/build-containers/templates/tripleo-build.sh.j2

@@ -88,7 +88,7 @@ openstack tripleo container image build \
      --volume {{ item }} \
 {%   endfor %}
 {%   endif %}
-{%   if release|default(branch) not  in ["train", "victoria"] %}
+{%   if release|default(branch) not  in ["train"] %}
      --tcib-extra tcib_release={{ ansible_distribution_major_version }} \
      --tcib-extra tcib_python_version={{ (ansible_distribution_major_version is version('9', '<')) | ternary ('3.6', '3.9') }} \
 {%   endif %}

roles/build-containers/vars/main.yaml

@@ -24,9 +24,6 @@ exclude_containers:
   wallaby:
     centos8: *exclude_master_containers
     centos9: *exclude_cs9_master_containers
-  victoria:
-    centos8: &exclude_containers
-      - neutron-mlnx-agent
   train:
     centos7: &exclude_containers_train
       - opendaylight
@@ -52,7 +49,8 @@ exclude_containers:
     redhat8: *exclude_master_containers
     redhat9: *exclude_cs9_master_containers
   rhos-16.2:
-    redhat8: *exclude_containers
+    redhat8:
+      - neutron-mlnx-agent
 
 timestamper_cmd: >-
     | awk '{ print strftime("%Y-%m-%d %H:%M:%S |"), $0; fflush(); }'

zuul.d/build-image.yaml

@@ -77,24 +77,18 @@
               - tripleoclient/v1/overcloud_image.py
               - elements/.*
               - ^image-yaml/.*
-        - tripleo-buildimage-overcloud-full-centos-8-victoria:
-            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-victoria:
-            files: *build_images_files
         - tripleo-buildimage-ironic-python-agent-centos-8-train:
             files: *build_images_files
-        - tripleo-buildimage-overcloud-hardened-full-centos-8-victoria:
+        - 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-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:
@@ -112,18 +106,12 @@
       jobs:
         - tripleo-buildimage-overcloud-full-centos-8:
             files: *build_images_files
-        - tripleo-buildimage-overcloud-full-centos-8-victoria:
-            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-victoria:
-            files: *build_images_files
         - tripleo-buildimage-ironic-python-agent-centos-8-train:
             files: *build_images_files
-        - tripleo-buildimage-overcloud-hardened-full-centos-8-victoria:
-            files: *build_images_hardened_files
         - tripleo-buildimage-overcloud-hardened-full-centos-8-train:
             files: *build_images_hardened_files
         - tripleo-buildimage-overcloud-full-centos-9:
@@ -183,7 +171,7 @@
 - job:
     name: tripleo-buildimage-ironic-python-agent-centos-9
     parent: tripleo-build-images-base-centos-9
-    branches: &c9_branches ^(?!stable/(train|victoria)).*$
+    branches: &c9_branches ^(?!stable/train).*$
     vars:
       tripleo_image_type: ironic-python-agent
     irrelevant-files: &build_image_irrelevant
@@ -237,7 +225,7 @@
 - job:
     name: tripleo-buildimage-ironic-python-agent-centos-8
     parent: tripleo-build-images-base-centos-8
-    branches: ^(stable/(train|victoria|wallaby)).*$
+    branches: ^(stable/(train|wallaby)).*$
     vars:
       tripleo_image_type: ironic-python-agent
     irrelevant-files:
@@ -247,7 +235,7 @@
 - job:
     name: tripleo-buildimage-overcloud-full-centos-8
     parent: tripleo-build-images-base-centos-8
-    branches: ^(stable/(train|victoria|wallaby)).*$
+    branches: ^(stable/(train|wallaby)).*$
     vars:
       tripleo_image_type: overcloud-full
     irrelevant-files:
@@ -257,21 +245,13 @@
 - job:
     name: tripleo-buildimage-overcloud-hardened-full-centos-8
     parent: tripleo-build-images-base-centos-8
-    branches: ^(stable/(train|victoria)).*$
+    branches: ^(stable/train).*$
     vars:
       tripleo_image_type: overcloud-hardened-full
     irrelevant-files:
       - ^.*\.rst$
       - ^releasenotes/.*$
 
-- job:
-    name: tripleo-buildimage-ironic-python-agent-centos-8-victoria
-    parent: tripleo-buildimage-ironic-python-agent-centos-8
-    branches: master
-    override-checkout: stable/victoria
-    vars:
-      branch_override: stable/victoria
-
 # Branchful job to run on CI branchless repos which have master only
 - job:
     name: tripleo-buildimage-ironic-python-agent-centos-8-train
@@ -281,14 +261,6 @@
     vars:
       branch_override: stable/train
 
-- job:
-    name: tripleo-buildimage-overcloud-full-centos-8-victoria
-    parent: tripleo-buildimage-overcloud-full-centos-8
-    branches: master
-    override-checkout: stable/victoria
-    vars:
-      branch_override: stable/victoria
-
 # Branchful job to run on CI branchless repos which have master only
 - job:
     name: tripleo-buildimage-overcloud-full-centos-8-train
@@ -298,14 +270,6 @@
     vars:
       branch_override: stable/train
 
-- job:
-    name: tripleo-buildimage-overcloud-hardened-full-centos-8-victoria
-    parent: tripleo-buildimage-overcloud-hardened-full-centos-8
-    branches: master
-    override-checkout: stable/victoria
-    vars:
-      branch_override: stable/victoria
-
 # Branchful job to run on CI branchless repos which have master only
 - job:
     name: tripleo-buildimage-overcloud-hardened-full-centos-8-train