Fixed upgrade test ENVs (#621)

Fixed upgrade test ENVs

Author: igor-karpukhin

.github/workflows/openshift-upgrade-test.yaml

@@ -46,12 +46,15 @@ jobs:
           opm version
           oc version
 
+      - name: Login to registry
+        run: docker login -u "${{ secrets.OPENSHIFT_UPGRADE_BOT_USERNAME }}" -p="${{ secrets.OPENSHIFT_UPGRADE_BOT_PASSWORD }}" quay.io
+
       - name: Run openshift upgrade test
         run: cd scripts && ./openshift-upgrade-test.sh
         env:
           OC_TOKEN: ${{ secrets.TOKEN }}
-          CLUSTER_API_URL: ${{ secret.OPENSHIFT_SERVER_API }}
+          CLUSTER_API_URL: ${{ secrets.OPENSHIFT_SERVER_API }}
           LATEST_RELEASE_REGISTRY: ${{ github.event.inputs.previousReleaseRegistry }}
-          REGISTRY: ${{ secret.DOCKER_REGISTRY }}
+          REGISTRY: ${{ github.event.inputs.registryForNewRelease }}
 
 

scripts/openshift-upgrade-test.sh

@@ -7,7 +7,7 @@ set -eou pipefail
 TEST_NAMESPACE=${TEST_NAMESPACE:-"atlas-upgrade-test"}
 LATEST_RELEASE_VERSION="${LATEST_RELEASE_VERSION:-1.0.0}"
 LATEST_RELEASE_REGISTRY=${LATEST_RELEASE_REGISTRY:-"quay.io/mongodb"}
-REGISTRY=${REGISTRY:-"quay.io/igorkarpukhin"}
+REGISTRY=${REGISTRY:-"quay.io/mongodb"}
 
 # This is used to build directory-based Openshift catalog for current version
 CATALOG_DIR="${CATALOG_DIR:-./openshift/atlas-catalog}"
@@ -20,10 +20,11 @@ if [ -z "${CURRENT_VERSION+x}" ]; then
 	echo "CURRENT_VERSION is not set. Setting to default: ${CURRENT_VERSION}"
 fi
 
-OPERATOR_NAME="mongodb-atlas-kubernetes-operator"
+OPERATOR_NAME="mongodb-atlas-kubernetes-operator-prerelease"
+LATEST_RELEASE_OPERATOR_NAME="mongodb-atlas-kubernetes-operator"
 NEW_OPERATOR_IMAGE="${REGISTRY}/${OPERATOR_NAME}:${CURRENT_VERSION}"
 OPERATOR_BUNDLE_IMAGE="${REGISTRY}/${OPERATOR_NAME}-bundle:${CURRENT_VERSION}"
-LATEST_RELEASE_BUNDLE_IMAGE="${LATEST_RELEASE_REGISTRY}/${OPERATOR_NAME}-bundle:${LATEST_RELEASE_VERSION}"
+LATEST_RELEASE_BUNDLE_IMAGE="${LATEST_RELEASE_REGISTRY}/${LATEST_RELEASE_OPERATOR_NAME}-bundle:${LATEST_RELEASE_VERSION}"
 OPERATOR_CATALOG_NAME="${OPERATOR_NAME}-catalog"
 OPERATOR_CATALOG_IMAGE="${REGISTRY}/${OPERATOR_NAME}-catalog:${CURRENT_VERSION}"
 OPERATOR_CATALOGSOURCE_NAME="${OPERATOR_CATALOG_NAME}"