DNM - Checking CRT issue for OCP 4.20 jobs

Add job definitions using crc-cloud-ocp-4-20-1-3xl as base image

Closes: OSPRH-21881
Partially-Closes: OSPRH-21875

Signed-off-by: Daniel Pawlik <dpawlik@redhat.com>

Author: vkmc

.zuul.yaml

@@ -1,19 +1,19 @@
 ---
 - nodeset:
-    name: stf-crc_extracted-ocp416
+    name: stf-crc_cloud-ocp418
     nodes:
       - name: controller
         label: cloud-centos-9-stream-tripleo-vexxhost
       - name: crc
-        label: coreos-crc-extracted-2-39-0-3xl
+        label: crc-cloud-ocp-4-18-1-3xl
 
 - nodeset:
-    name: stf-crc_extracted-ocp418
+    name: stf-crc_cloud-ocp420
     nodes:
       - name: controller
         label: cloud-centos-9-stream-tripleo-vexxhost
       - name: crc
-        label: crc-cloud-ocp-4-18-1-3xl
+        label: crc-cloud-ocp-4-20-1-3xl
 
 - job:
     name: stf-base-2node
@@ -142,103 +142,104 @@
     vars:
       scenario: "catalog_deploy"
 
-- job:
-    name: stf-crc-ocp_416-nightly_bundles
-    parent: stf-crc-nightly_bundles
-    description: |
-      Deploy STF using the nightly bundles on OCP 4.16
-    nodeset: stf-crc_extracted-ocp416
-
 - job:
     name: stf-crc-ocp_418-nightly_bundles
     parent: stf-crc-nightly_bundles
     description: |
       Deploy STF using the nightly bundles on OCP 4.18
-    nodeset: stf-crc_extracted-ocp418
+    nodeset: stf-crc_cloud-ocp418
 
 - job:
-    name: stf-crc-ocp_416-local_build
-    parent: stf-crc-local_build
+    name: stf-crc-ocp_420-nightly_bundles
+    parent: stf-crc-nightly_bundles
     description: |
-      Build STF locally and deploy from index on OCP 4.16
-    nodeset: stf-crc_extracted-ocp416
+      Deploy STF using the nightly bundles on OCP 4.20
+    nodeset: stf-crc_cloud-ocp420
 
 - job:
     name: stf-crc-ocp_418-local_build
     parent: stf-crc-local_build
     description: |
       Build STF locally and deploy from index on OCP 4.18
-    nodeset: stf-crc_extracted-ocp418
+    nodeset: stf-crc_cloud-ocp418
 
 - job:
-    name: stf-crc-ocp_416-local_build-index_deploy
-    parent: stf-crc-local_build-index_deploy
+    name: stf-crc-ocp_420-local_build
+    parent: stf-crc-local_build
     description: |
-      Build STF locally and deploy from index on OCP 4.16
-    nodeset: stf-crc_extracted-ocp416
+      Build STF locally and deploy from index on OCP 4.20
+    nodeset: stf-crc_cloud-ocp420
 
 - job:
     name: stf-crc-ocp_418-local_build-index_deploy
     parent: stf-crc-local_build-index_deploy
     description: |
       Build STF locally and deploy from index on OCP 4.18
-    nodeset: stf-crc_extracted-ocp418
+    nodeset: stf-crc_cloud-ocp418
 
 - job:
-    name: stf-crc-ocp_416-nightly_bundles-index_deploy
-    parent: stf-crc-nightly_bundles-index_deploy
+    name: stf-crc-ocp_420-local_build-index_deploy
+    parent: stf-crc-local_build-index_deploy
     description: |
-      Create an index image using nightly bundles and deploy STF from it on OCP 4.16
-    nodeset: stf-crc_extracted-ocp416
+      Build STF locally and deploy from index on OCP 4.20
+    nodeset: stf-crc_cloud-ocp420
 
 - job:
     name: stf-crc-ocp_418-nightly_bundles-index_deploy
     parent: stf-crc-nightly_bundles-index_deploy
     description: |
       Create an index image using nightly bundles and deploy STF from it on OCP 4.18
-    nodeset: stf-crc_extracted-ocp418
+    nodeset: stf-crc_cloud-ocp418
 
 - job:
-    name: stf-crc-ocp_416-catalog_deploy
-    parent: stf-crc-catalog_deploy
+    name: stf-crc-ocp_420-nightly_bundles-index_deploy
+    parent: stf-crc-nightly_bundles-index_deploy
     description: |
-      Use a pre-built index image to create a CatalogSource and deploy STF from it on OCP 4.16
-    nodeset: stf-crc_extracted-ocp416
+      Create an index image using nightly bundles and deploy STF from it on OCP 4.20
+    nodeset: stf-crc_cloud-ocp420
 
 - job:
     name: stf-crc-ocp_418-catalog_deploy
     parent: stf-crc-catalog_deploy
     description: |
       Use a pre-built index image to create a CatalogSource and deploy STF from it on OCP 4.18
-    nodeset: stf-crc_extracted-ocp418
+    nodeset: stf-crc_cloud-ocp418
+
+- job:
+    name: stf-crc-ocp_420-catalog_deploy
+    parent: stf-crc-catalog_deploy
+    description: |
+      Use a pre-built index image to create a CatalogSource and deploy STF from it on OCP 4.20
+    nodeset: stf-crc_cloud-ocp420
+
 
 - project-template:
     name: stf-crc-jobs
     description: |
       STF CRC jobs that build and deploy STF
     github-check:
       jobs:
-        - stf-crc-ocp_416-local_build
-        - stf-crc-ocp_418-local_build
-        - stf-crc-ocp_416-local_build-index_deploy
-        - stf-crc-ocp_418-local_build-index_deploy
-        - stf-crc-ocp_416-nightly_bundles-index_deploy
+        # - stf-crc-ocp_418-local_build
+        # - stf-crc-ocp_420-local_build
+        # - stf-crc-ocp_418-local_build-index_deploy
+        # - stf-crc-ocp_420-local_build-index_deploy
         - stf-crc-ocp_418-nightly_bundles-index_deploy
-        - stf-crc-ocp_416-catalog_deploy
+        - stf-crc-ocp_420-nightly_bundles-index_deploy
         - stf-crc-ocp_418-catalog_deploy
+        - stf-crc-ocp_420-catalog_deploy
 
 - project:
     name: infrawatch/service-telemetry-operator
     templates:
       - stf-crc-jobs
     periodic:
       jobs:
-        - stf-crc-ocp_416-nightly_bundles
         - stf-crc-ocp_418-nightly_bundles
-        - stf-crc-ocp_416-local_build
+        - stf-crc-ocp_420-nightly_bundles
         - stf-crc-ocp_418-local_build
-        - stf-crc-ocp_416-local_build-index_deploy
+        - stf-crc-ocp_420-local_build
         - stf-crc-ocp_418-local_build-index_deploy
-        - stf-crc-ocp_416-nightly_bundles-index_deploy
+        - stf-crc-ocp_420-local_build-index_deploy
+        - stf-crc-ocp_418-nightly_bundles-index_deploy
         - stf-crc-ocp_418-nightly_bundles-index_deploy
 

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/operator-framework/ansible-operator:v1.36.1
+FROM quay.io/operator-framework/ansible-operator:v1.38.1
 
 # temporarily switch to root user to adjust image layers
 USER 0

build/validate_deployment.sh

@@ -54,7 +54,7 @@ esac
 
 echo -e "\n* [info] Waiting for all pods to show Ready/Complete\n"
 while oc get pods --selector '!openshift.io/build.name' | tail -n +2 | grep -v -E 'Running|Completed'; do
-    sleep 3
+    sleep 5m
 done
 
 echo -e "\n* [info] CI Build complete. You can now run tests.\n"

ci/README.md

@@ -15,8 +15,8 @@ Three scenarios run:
 - `nightly_bundles-index_deploy`, which retrieves the nightly bundles and does an index-based deployment.
 
 Each of these scenarios run across the following OCP versions:
-- 4.16
 - 4.18
+- 4.20
 
 ### Periodic jobs
 

deploy/olm-catalog/service-telemetry-operator/Dockerfile.in

@@ -13,7 +13,7 @@ LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4
 LABEL operators.operatorframework.io.metrics.project_layout=ansible
 LABEL com.redhat.delivery.operator.bundle=true
-LABEL com.redhat.openshift.versions="v4.16-v4.18"
+LABEL com.redhat.openshift.versions="v4.18-v4.20"
 LABEL com.redhat.delivery.backport=false
 
 LABEL com.redhat.component="service-telemetry-operator-bundle-container" \

deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml

@@ -1,6 +1,6 @@
 properties:
   - type: olm.maxOpenShiftVersion
-    value: "4.18"
+    value: "4.20"
   - type: olm.constraint
     value:
       failureMessage: Require Smart Gateway for Service Telemetry Framework