Use CS10 meta content provider and tcib images for testing (#290)

This pr adds following things:
- Drops openstack-k8s-operators content provider,
- Modifies existing patch-openstack-versions to a template to
  override/use meta content provider tcib containers via
telemetry_registry and telemetry_tag var.

Signed-off-by: Chandan Kumar <[email protected]>
Co-authored-by: Emma Foley <[email protected]>

Author: raukadah

.zuul.yaml

@@ -1,12 +1,19 @@
 ---
 - job:
     name: functional-autoscaling-tests-osp18
+    dependencies: ["telemetry-openstack-meta-content-provider-master"]
     parent: telemetry-operator-multinode-autoscaling
     description: |
       Run autoscaling functional tests, tempest tests and metrics
       functional tests on osp18+patched versions of aodh and heat.
+    extra-vars: &functional_autoscaling_extra_vars
+      # Override zuul meta content provider provided content_provider_dlrn_md5_hash
+      # var. As returned dlrn md5 hash comes from master release but job is using
+      # antelope content.
+      content_provider_dlrn_md5_hash: ''
     vars:
       patch_observabilityclient: true
+      cifmw_update_containers: false
       cifmw_extras:
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml"
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml"
@@ -52,17 +59,21 @@
 - job:
     name: functional-tests-on-osp18
     parent: functional-autoscaling-tests-osp18
+    extra-vars: *functional_autoscaling_extra_vars
     description: |
       functional-tests-on-osp18 is an alias of functional-autoscaling-tests-osp18, 
       temporary added until openstack-k8s-operators/telemetry-operator updates 
       references of functional-tests-on-osp18 jobs.
 
 - job:
     name: functional-logging-tests-osp18
+    dependencies: ["telemetry-openstack-meta-content-provider-master"]
     parent: telemetry-operator-multinode-logging
     description: |
       Run the logging functional tests and tempest smoketests on osp18
+    extra-vars: *functional_autoscaling_extra_vars
     vars:
+      cifmw_update_containers: false
       cifmw_extras:
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir  }}/scenarios/centos-9/multinode-ci.yml"
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-logging.yml"
@@ -77,6 +88,7 @@
 - job:
     name: functional-metric-verification-tests-osp18
     parent: functional-autoscaling-tests-osp18
+    extra-vars: *functional_autoscaling_extra_vars
     description: |
       Run the autoscaling functional tests, tempest tests and metrics
       functional tests on osp18+patched versions of adoh and heat.
@@ -92,10 +104,12 @@
 
 - job:
     name: functional-graphing-tests-osp18
+    dependencies: ["telemetry-openstack-meta-content-provider-master"]
     parent: telemetry-operator-multinode-autoscaling
     description: |
       Run the UI Graphing test and tempest smoketests on osp18.
     vars:
+      cifmw_update_containers: false
       crc_enable_monitoring: true
       cifmw_extras:
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir  }}/scenarios/centos-9/multinode-ci.yml"
@@ -108,17 +122,16 @@
     roles:
       - zuul: github.com/openstack-k8s-operators/ci-framework
     required-projects: *required_projects
-
+    extra-vars: *functional_autoscaling_extra_vars
 
 - project:
     name: infrawatch/feature-verification-tests
     github-check:
       jobs:
+        - telemetry-openstack-meta-content-provider-master:
+            override-checkout: main
         - feature-verification-tests-noop:
             files: *irrelevant_files
-        - openstack-k8s-operators-content-provider:
-            override-checkout: main
-            irrelevant-files: *irrelevant_files
         - functional-autoscaling-tests-osp18:
             files:
               - roles/telemetry_autoscaling/.*

ci/patch-openstack-versions.yaml

@@ -0,0 +1,14 @@
+---
+# telemetry_registry value should be quay.rdoproject.org/podified-master-centos10
+# telemetry_tag value should be current-tested.
+spec:
+  customContainerImages:
+    aodhAPIImage: {{ telemetry_registry }}/openstack-aodh-api:{{ telemetry_tag }}
+    aodhEvaluatorImage: {{ telemetry_registry }}/openstack-aodh-evaluator:{{ telemetry_tag }}
+    aodhListenerImage: {{ telemetry_registry }}/openstack-aodh-listener:{{ telemetry_tag }}
+    aodhNotifierImage: {{ telemetry_registry }}/openstack-aodh-notifier:{{ telemetry_tag }}
+    ceilometerCentralImage: {{ telemetry_registry }}/openstack-ceilometer-central:{{ telemetry_tag }}
+    ceilometerComputeImage: {{ telemetry_registry }}/openstack-ceilometer-compute:{{ telemetry_tag }}
+    heatAPIImage: {{ telemetry_registry }}/openstack-heat-api:{{ telemetry_tag }}
+    heatCfnapiImage: {{ telemetry_registry }}/openstack-heat-api-cfn:{{ telemetry_tag }}
+    heatEngineImage: {{ telemetry_registry }}/openstack-heat-engine:{{ telemetry_tag }}

ci/patch-openstack-versions.yaml.j2

@@ -8,10 +8,20 @@
     - vars/common.yml
     - vars/osp18_env.yml
   tasks:
+    - name: Make sure logs directory exists
+      ansible.builtin.file:
+        path: "{{ logs_dir }}"
+        state: directory
+        recurse: true
+
+    - name: Generate container update template file
+      ansible.builtin.template:
+        src: "patch-openstack-versions.yaml.j2"
+        dest: "{{ logs_dir }}/patch-openstack-versions.yaml"
     - name: Patch the openstackversions to use the master containers for aodh, heat and ceilometer
       ansible.builtin.shell:
         cmd: |
-          oc patch openstackversions controlplane --type merge --patch-file ci/patch-openstack-versions.yaml
+          oc patch openstackversions controlplane --type merge --patch-file {{ logs_dir }}/patch-openstack-versions.yaml
         chdir: "{{ fvt_dir }}"
       tags:
         - setup

ci/use-master-containers.yml

@@ -1,3 +1,35 @@
 ---
 fvt_dir: "{{ ansible_env.HOME }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}"
 logs_dir: "{{ ansible_env.HOME }}/ci-framework-data/tests/feature-verification-tests"
+
+#
+# vars for setting container registry while working with meta content provider
+#
+
+#
+# We use telemetry_registry and telemetry_tag in ci/patch-openstack-versions.yaml.j2
+# file to use telemetry specific containers from content provider or other registry.
+#
+#
+# When there is a Depends-On: <Opendev Change> on github pull request description
+# then zuul meta content provider will return content_provider_os_registry_url with value
+# <content_provider_ip:port/registry_namespace>.
+#
+# When there is no Depends-On: <Opendev Change> then
+# then zuul meta content provider will return content_provider_os_registry_url with value
+# null string.
+#
+
+telemetry_registry: >-
+  {%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%}
+  {{ content_provider_os_registry_url  }}
+  {%- else -%}
+  quay.rdoproject.org/podified-master-centos10
+  {%- endif -%}
+
+telemetry_tag: >-
+  {%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%}
+  telemetry_latest
+  {%- else -%}
+  current-tested
+  {%- endif -%}