From 4238c3d16206c57593d427dac8208f70f2c8c372 Mon Sep 17 00:00:00 2001
From: SanjalKatiyar <sanjaldhir@gmail.com>
Date: Thu, 5 Oct 2023 11:12:07 +0530
Subject: [PATCH] update CI to ODF 4.14 release

---
 .github/workflows/frontend-build.yml |  2 +-
 openshift-ci/odf-catalog-source.yaml | 25 +++++++++++++++++++++++--
 test-prow-e2e.sh                     | 10 ++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml
index e3e154306..6ad8fcfbe 100644
--- a/.github/workflows/frontend-build.yml
+++ b/.github/workflows/frontend-build.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches: [master]
   pull_request:
-    branches: [master, release-4.13, release-4.13-compatibility]
+    branches: [master, release-4.14, release-4.14-compatibility]
 
 jobs:
   build-test:
diff --git a/openshift-ci/odf-catalog-source.yaml b/openshift-ci/odf-catalog-source.yaml
index a95d85edd..209bf22c2 100644
--- a/openshift-ci/odf-catalog-source.yaml
+++ b/openshift-ci/odf-catalog-source.yaml
@@ -28,7 +28,7 @@ spec:
   icon:
     base64data: ''
     mediatype: ''
-  image: quay.io/rhceph-dev/ocs-registry:latest-stable-4.13.0
+  image: quay.io/rhceph-dev/ocs-registry:latest-stable-4.14.0
   priority: 100
   publisher: Red Hat
   sourceType: grpc
@@ -42,8 +42,29 @@ metadata:
   name: odf-operator
   namespace: openshift-storage
 spec:
-  channel: stable-4.13
+  channel: stable-4.14
   installPlanApproval: Automatic
   name: odf-operator
   source: redhat-operators
   sourceNamespace: openshift-marketplace
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: rhceph-dev-icsp
+  namespace: openshift-storage
+  labels:
+    app: rhceph-dev-icsp
+spec:
+  securityContext:
+    runAsNonRoot: true
+    seccompProfile:
+      type: RuntimeDefault
+  containers:
+    - name: rhceph-dev-icsp
+      image: quay.io/rhceph-dev/ocs-registry:latest-stable-4.14.0
+      securityContext:
+        allowPrivilegeEscalation: false
+        capabilities:
+          drop:
+            - ALL
diff --git a/test-prow-e2e.sh b/test-prow-e2e.sh
index 9cc41f380..2be74fd90 100755
--- a/test-prow-e2e.sh
+++ b/test-prow-e2e.sh
@@ -80,6 +80,16 @@ until [ "$(oc -n openshift-marketplace get catalogsource -o=jsonpath="{.items[?(
 done
 EOF
 
+echo "Waiting for Catalog image's pod to be running"
+timeout 5m bash <<-'EOF'
+until [ "$(oc get pod -n openshift-storage rhceph-dev-icsp -o=jsonpath="{.status.phase}")" == "Running" ]; do
+  sleep 1
+done
+EOF
+
+echo "Creating ImageContentSourcePolicy rules needed for ODF"
+oc exec -it --namespace openshift-storage rhceph-dev-icsp -- cat /icsp.yaml | oc apply -f -
+
 # Enable console plugin for ODF-Console
 export CONSOLE_CONFIG_NAME="cluster"
 export ODF_PLUGIN_NAME="odf-console"