Update RedHat OpenShift container preflight testing (#804)

Author: thegridman

Makefile

@@ -3045,7 +3045,7 @@ new-version: ## Update the Operator Version (must be run with NEXT_VERSION=x.y.z
 	yq -i e 'select(.schema == "olm.template.basic").entries[] |= select(.schema == "olm.channel" and .name == "stable").entries += [{"name" : "coherence-operator.v$(VERSION)", "replaces": "coherence-operator.v$(PREV_VERSION)"}]' $(SCRIPTS_DIR)/olm/catalog-template.yaml
 	yq -i e 'select(.schema == "olm.template.basic").entries += [{"schema" : "olm.bundle", "image": "$(GITHUB_REGISTRY)/$(OPERATOR_IMAGE_NAME)-bundle:$(OPERATOR_IMAGE_TAG)"}]' $(SCRIPTS_DIR)/olm/catalog-template.yaml
 
-GIT_NEXT_BRANCH = "version-update-$(NEXT_VERSION)"
+GIT_NEXT_BRANCH = "set-version-$(NEXT_VERSION)"
 GIT_LABEL       = "version-update"
 
 .PHONY: new-version-branch

hack/openshift/operator-cert.sh

@@ -175,10 +175,10 @@ if [ "${USE_LATEST_OPERATOR_RELEASE}" = "true" ]; then
   echo "Latest Operator version is ${OPERATOR_VERSION}"
 # Check the latest release image exists on OCR
   COHERENCE_OPERATOR_IMAGE="container-registry.oracle.com/middleware/coherence-operator:${OPERATOR_VERSION}"
-  echo "Checking Oracle Container Registry for image ${OCR_COHERENCE_IMAGE}"
-  podman manifest inspect "${OCR_COHERENCE_IMAGE}" > /dev/null
+  echo "Checking Oracle Container Registry for image ${COHERENCE_OPERATOR_IMAGE}"
+  podman manifest inspect "${COHERENCE_OPERATOR_IMAGE}" > /dev/null
   if [ $? -ne 0 ]; then
-    echo "ERROR: Image ${OCR_COHERENCE_IMAGE} does not exist on OCR."
+    echo "ERROR: Image ${COHERENCE_OPERATOR_IMAGE} does not exist on OCR."
     exit 1
   fi
 # Use a proper name for the git branch