Merge "Re-enable Xena jobs"

zuul.d/base.yaml

@@ -23,9 +23,9 @@
         - openstack-helm-images-cinder-victoria-ubuntu_focal
         - openstack-helm-images-compute-kit-wallaby-ubuntu_focal
         - openstack-helm-images-cinder-wallaby-ubuntu_focal
-        # TODO(gagehugo): Fix the job in osh and uncomment
+        - openstack-helm-images-compute-kit-xena-ubuntu_focal
-        # - openstack-helm-images-compute-kit-xena-ubuntu_focal
+        - openstack-helm-images-cinder-xena-ubuntu_focal
-        # - openstack-helm-images-cinder-xena-ubuntu_focal
+        # TODO(gagehugo): Fix the yoga job failure and uncomment
         # - openstack-helm-images-compute-kit-yoga-ubuntu_focal
         # - openstack-helm-images-cinder-yoga-ubuntu_focal
         - openstack-helm-images-horizon-wallaby-ubuntu_focal
@@ -38,8 +38,8 @@
         - openstack-helm-images-cinder-victoria-ubuntu_focal
         - openstack-helm-images-compute-kit-wallaby-ubuntu_focal
         - openstack-helm-images-cinder-wallaby-ubuntu_focal
-        # - openstack-helm-images-compute-kit-xena-ubuntu_focal
+        - openstack-helm-images-compute-kit-xena-ubuntu_focal
-        # - openstack-helm-images-cinder-xena-ubuntu_focal
+        - openstack-helm-images-cinder-xena-ubuntu_focal
         # - openstack-helm-images-compute-kit-yoga-ubuntu_focal
         # - openstack-helm-images-cinder-yoga-ubuntu_focal
         - openstack-helm-images-horizon-wallaby-ubuntu_focal
@@ -52,8 +52,8 @@
         - openstack-helm-images-cinder-victoria-ubuntu_focal
         - openstack-helm-images-compute-kit-wallaby-ubuntu_focal
         - openstack-helm-images-cinder-wallaby-ubuntu_focal
-        # - openstack-helm-images-compute-kit-xena-ubuntu_focal
+        - openstack-helm-images-compute-kit-xena-ubuntu_focal
-        # - openstack-helm-images-cinder-xena-ubuntu_focal
+        - openstack-helm-images-cinder-xena-ubuntu_focal
         # - openstack-helm-images-compute-kit-yoga-ubuntu_focal
         # - openstack-helm-images-cinder-yoga-ubuntu_focal
         - openstack-helm-images-horizon-wallaby-ubuntu_focal

zuul.d/openstack-loci.yaml

@@ -18,23 +18,23 @@
       jobs:
         - openstack-helm-images-build-openstack-loci-victoria-ubuntu_focal
         - openstack-helm-images-build-openstack-loci-wallaby-ubuntu_focal
-        # NOTE(gagehugo): Fix the issue with X & Y, then uncomment
+        - openstack-helm-images-build-openstack-loci-xena-ubuntu_focal
-        #- openstack-helm-images-build-openstack-loci-xena-ubuntu_focal
+        # NOTE(gagehugo): Fix Y, then uncomment
         #- openstack-helm-images-build-openstack-loci-yoga-ubuntu_focal
         - openstack-helm-images-build-openstack-loci-master-ubuntu_focal
     gate:
       jobs:
         - openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal
         - openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
-        # - openstack-helm-images-upload-openstack-loci-xena-ubuntu_focal
+        - openstack-helm-images-upload-openstack-loci-xena-ubuntu_focal
         # - openstack-helm-images-upload-openstack-loci-yoga-ubuntu_focal
         - openstack-helm-images-upload-openstack-loci-master-ubuntu_focal
     promote:
       jobs:
         - openstack-helm-images-promote-openstack-loci-victoria-ubuntu_focal
         - openstack-helm-images-promote-openstack-loci-wallaby-ubuntu_focal
+        - openstack-helm-images-promote-openstack-loci-xena-ubuntu_focal
         # - openstack-helm-images-promote-openstack-loci-yoga-ubuntu_focal
-        # - openstack-helm-images-promote-openstack-loci-xena-ubuntu_focal
         - openstack-helm-images-promote-openstack-loci-master-ubuntu_focal
     periodic-weekly:
       jobs:
@@ -48,12 +48,11 @@
             dependencies:
               - name: openstack-helm-images-compute-kit-wallaby-ubuntu_focal
               - name: openstack-helm-images-cinder-wallaby-ubuntu_focal
-        # NOTE(gagehugo): Fix X & Y jobs, then re-enable
+        - openstack-helm-images-upload-openstack-loci-xena-ubuntu_focal
-        # - openstack-helm-images-upload-openstack-loci-xena-ubuntu_focal
+        - openstack-helm-images-promote-openstack-loci-xena-ubuntu_focal:
-        # - openstack-helm-images-promote-openstack-loci-xena-ubuntu_focal:
+            dependencies:
-        #    dependencies:
+              - name: openstack-helm-images-compute-kit-xena-ubuntu_focal
-        #      - name: openstack-helm-images-compute-kit-xena-ubuntu_focal
+              - name: openstack-helm-images-cinder-xena-ubuntu_focal
-        #      - name: openstack-helm-images-cinder-xena-ubuntu_focal
         # - openstack-helm-images-upload-openstack-loci-yoga-ubuntu_focal
         # - openstack-helm-images-promote-openstack-loci-yoga-ubuntu_focal:
         #   dependencies: