WIP [s2i] glance/ceph job

zuul.d/jobs.yaml

@@ -23,8 +23,10 @@
         - glance
 
 - job:
-    name: glance-operator-tempest
+    name: glance-operator-antelope-tempest
     parent: podified-multinode-hci-deployment-crc-1comp-backends
+    description: |
+      Test the old antelope containers with the newer operators.
     irrelevant-files: *common-irrelevant-files
     vars:
       cifmw_ceph_daemons_layout:
@@ -36,3 +38,89 @@
       cifmw_test_operator_tempest_concurrency: 3
       cifmw_test_operator_tempest_include_list: |
         ^tempest.api.image.
+
+
+- job:
+    name: glance-s2i-content-provider
+    parent: s2i-openstack-container-content-provider
+    description: |
+      Build s2i glance service images for glance-s2i tempest jobs.
+    required-projects:
+      - name: openstack-k8s-operators/s2i-openstack-containers
+        override-checkout: main
+    vars:
+      s2i_ci_images:
+        - glance/glance-api
+
+- job:
+    name: s2i-tempest-base
+    parent: podified-multinode-hci-deployment-crc-1comp-backends
+    description: |
+      Validate speculatively-built s2i images against a live
+      HCI OpenStack deployment with Ceph. s2i-built images from the
+      content provider are applied to OpenStackVersion during
+      edpm_prepare via ci-framework set_containers before the control
+      plane is deployed.
+
+      Scalar OpenStackVersion fields come from the s2i image map.
+      It is possible to extend it with additional mapping,
+      for example for cinder-volume and manila-share.
+    required-projects:
+      - name: openstack-k8s-operators/s2i-openstack-containers
+        override-checkout: main
+    vars:
+      # Operator CP owns content_provider_registry_ip (catalog + CRC
+      # insecure list). Append the s2i registry so CRC can pull both.
+      cifmw_crc_additional_insecure_registries:
+        - "{{ s2i_content_provider_registry_ip }}:5001"
+      cifmw_crc_additional_allowed_registries:
+        - "{{ s2i_content_provider_registry_ip }}:5001"
+      cifmw_set_containers_preserve_unlisted: true
+      # Zuul rejects vars that start with "_". Keep the mapping in one
+      # expression: scalar OpenStackVersion fields from the s2i provider,
+      # plus the additional mapping
+      cifmw_set_containers_images: >-
+        {{
+          (
+            s2i_content_provider_os_custom_container_images | dict2items |
+            json_query('[].{name: key, full_registry: value}')
+          ) + cifmw_set_containers_images_extra_mapping
+        }}
+      cifmw_set_containers_images_extra_mapping: []
+
+- job:
+    name: glance-s2i-tempest-ceph
+    parent: s2i-tempest-base
+    description: |
+      Validate speculatively-built s2i glance images against a live
+      HCI OpenStack deployment with Ceph.
+    irrelevant-files: *common-irrelevant-files
+    vars:
+      cifmw_ceph_daemons_layout:
+        rgw_enabled: false
+        dashboard_enabled: false
+        cephfs_enabled: true
+        ceph_nfs_enabled: false
+      #cifmw_set_containers_images_extra_mapping:
+      #  - name: 'cinderVolumeImages'
+      #    full_registry: >-
+      #      {{ s2i_content_provider_registry_ip ~ ':5001/' ~
+      #         s2i_ci_content.namespace ~
+      #         '/openstack-cinder-volume:' ~
+      #         s2i_ci_content.tag }}
+      #    backends:
+      #      - 'volume1'
+      cifmw_test_operator_tempest_concurrency: 3
+      cifmw_test_operator_tempest_include_list: |
+        ^tempest.api.image..*
+        ^tempest.scenario.test_snapshot_pattern..*
+        ^glance_tempest_plugin..*
+        ^barbican_tempest_plugin.tests.scenario.test_certificate_validation..*
+        ^barbican_tempest_plugin.tests.scenario.test_image_signing.ImageSigningTest..*
+        ^tempest.api.image.v2.admin.test_image_caching.ImageCachingTest.test_image_caching_cycle
+      cifmw_test_operator_tempest_tempestconf_config:
+        overrides: |
+          service_available.cinder true
+          image_signature_verification.enforced False
+          image_signature_verification.certificate_validation False
+          image.image_caching_enabled true

zuul.d/projects.yaml

@@ -9,6 +9,11 @@
         - glance-operator-kuttl:
             dependencies:
               - openstack-k8s-operators-content-provider
-        - glance-operator-tempest:
+        - glance-operator-antelope-tempest:
             dependencies:
               - openstack-k8s-operators-content-provider
+        - glance-s2i-content-provider
+        - glance-s2i-tempest-ceph:
+            dependencies:
+              - openstack-k8s-operators-content-provider
+              - glance-s2i-content-provider