Fix Openshift test:

* Allow select Openshift version * Load Operator image from local build instead of remote registry Signed-off-by: pjuarezd <[email protected]>
minio · Aug 5, 2023 · 8db3654 · 8db3654
1 parent c1b6aac
commit 8db3654
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/testing/deploy-openshift-4.sh → testing/deploy-openshift-4.13.6.sh b/testing/deploy-openshift-4.sh → testing/deploy-openshift-4.13.6.sh
@@ -28,12 +28,8 @@ function main() {
 
     create_marketplace_catalog "certified-operators"
 
-    install_operator "certified-operators" # "community-operators", "redhat-marketplace"
+    install_operator "certified-operators"
 
-    # install_operator
-    # install_tenant
-    # check_tenant_status tenant-lite myminio
-
     #destroy_crc
 }
 

diff --git a/testing/openshift-common.sh b/testing/openshift-common.sh
@@ -64,7 +64,7 @@ yell() { echo "$0: $*" >&2; }
 
 die() {
   yell "$*"
-  destroy_crc && exit 111
+  exit 111
 }
 
 try() { "$@" || die "cannot $*"; }
@@ -168,6 +168,8 @@ function create_marketplace_catalog(){
   echo "Compiling operator bundle for $catalog"
   cp -r "${SCRIPT_DIR}/../$catalog/." ${SCRIPT_DIR}/openshift/bundle
   yq -i ".metadata.annotations.containerImage |= (\"${operatorContainerImage}\")" ${SCRIPT_DIR}/openshift/bundle/manifests/$package.clusterserviceversion.yaml
+  yq -i ".spec.install.spec.deployments.[0].spec.template.spec.containers.[0].image |= (\"${operatorContainerImage}\")" ${SCRIPT_DIR}/openshift/bundle/manifests/$package.clusterserviceversion.yaml
+  yq -i ".spec.install.spec.deployments.[1].spec.template.spec.containers.[0].image |= (\"${operatorContainerImage}\")" ${SCRIPT_DIR}/openshift/bundle/manifests/$package.clusterserviceversion.yaml
   yq -i ".annotations.\"operators.operatorframework.io.bundle.package.v1\" |= (\"${package}-noop\")" ${SCRIPT_DIR}/openshift/bundle/metadata/annotations.yaml
   (cd "${SCRIPT_DIR}/.." && podman build --quiet --no-cache -t $bundleContainerImage -f ${SCRIPT_DIR}/openshift/bundle.Dockerfile ${SCRIPT_DIR}/openshift)
   podman login -u `oc whoami` -p `oc whoami --show-token` $registry --tls-verify=false