improvements

Author: KubeSaw

.github/workflows/publish-operators-for-ui-e2e-tests.yml

@@ -176,11 +176,11 @@ e2e-run-sandbox-ui:
 
 .PHONY: test-ui-e2e
 test-ui-e2e:
-	$(MAKE) prepare-and-deploy-e2e deploy-sandbox-ui e2e-run-sandbox-ui ENVIRONMENT=${UI_ENVIRONMENT}
+	$(MAKE) prepare-and-deploy-e2e deploy-sandbox-ui e2e-run-sandbox-ui DEPLOY_LATEST=true ENVIRONMENT=${UI_ENVIRONMENT}
 
 .PHONY: test-ui-e2e-local
 test-ui-e2e-local:
-	$(MAKE) prepare-and-deploy-e2e deploy-sandbox-ui e2e-run-sandbox-ui RHDH_PLUGINS_DIR=${PWD}/../rhdh-plugins ENVIRONMENT=${UI_ENVIRONMENT}
+	$(MAKE) prepare-and-deploy-e2e deploy-sandbox-ui e2e-run-sandbox-ui RHDH_PLUGINS_DIR=${PWD}/../rhdh-plugins DEPLOY_LATEST=true ENVIRONMENT=${UI_ENVIRONMENT}
 
 
 UNIT_TEST_IMAGE_NAME=sandbox-ui-e2e-tests

.github/workflows/publish-sandbox-ui-for-ui-e2e-tests.yml

@@ -110,22 +110,16 @@ if [[ -n "${CI}${REG_REPO_PATH}${HOST_REPO_PATH}" ]] && [[ $(echo ${REPO_NAME} |
     if [[ ${PUBLISH_OPERATOR} == "true" ]]; then
         push_image
         OPERATOR_IMAGE_LOC=${IMAGE_LOC}
-        make -C ${REPOSITORY_PATH} publish-current-bundle INDEX_IMAGE_NAME=${REPO_NAME_FOR_IMAGE}-index INDEX_IMAGE_TAG=${BUNDLE_AND_INDEX_TAG} BUNDLE_TAG=${BUNDLE_AND_INDEX_TAG} QUAY_NAMESPACE=${QUAY_NAMESPACE} OTHER_REPO_PATH=${REG_REPO_PATH} OTHER_REPO_IMAGE_LOC=${REG_SERV_IMAGE_LOC} IMAGE=${OPERATOR_IMAGE_LOC}
+        make -C ${REPOSITORY_PATH} publish-current-bundle INDEX_IMAGE_TAG=${BUNDLE_AND_INDEX_TAG} BUNDLE_TAG=${BUNDLE_AND_INDEX_TAG} QUAY_NAMESPACE=${QUAY_NAMESPACE} OTHER_REPO_PATH=${REG_REPO_PATH} OTHER_REPO_IMAGE_LOC=${REG_SERV_IMAGE_LOC} IMAGE=${OPERATOR_IMAGE_LOC}
     fi
 else
     INDEX_IMAGE_LOC="quay.io/codeready-toolchain/host-operator-index:latest"
-    if [[ "${ENVIRONMENT}" == "ui-e2e-tests" ]]; then
-        INDEX_IMAGE_LOC="quay.io/codeready-toolchain/host-operator-ui-e2e-tests-index:latest"
-    fi
 fi
 
 if [[ ${INSTALL_OPERATOR} == "true" ]]; then
     OPERATOR_RESOURCE_NAME=host-operator
     OPERATOR_NAME=toolchain-host-operator
     INDEX_IMAGE_NAME=host-operator-index
-    if [[ "${ENVIRONMENT}" == "ui-e2e-tests" ]]; then
-        INDEX_IMAGE_NAME=host-operator-ui-e2e-tests-index
-    fi
     NAMESPACE=${HOST_NS}
     EXPECT_CRD=toolchainconfigs.toolchain.dev.openshift.com
     install_operator

make/sandbox-ui.mk

@@ -98,23 +98,17 @@ if [[ -n "${CI}${MEMBER_REPO_PATH}" ]] && [[ $(echo ${REPO_NAME} | sed 's/"//g')
         push_image
 
         OPERATOR_IMAGE_LOC=${IMAGE_LOC}
-        make -C ${REPOSITORY_PATH} publish-current-bundle INDEX_IMAGE_NAME=${REPO_NAME_FOR_IMAGE}-index INDEX_IMAGE_TAG=${BUNDLE_AND_INDEX_TAG} BUNDLE_TAG=${BUNDLE_AND_INDEX_TAG} QUAY_NAMESPACE=${QUAY_NAMESPACE} IMAGE=${OPERATOR_IMAGE_LOC}
+        make -C ${REPOSITORY_PATH} publish-current-bundle INDEX_IMAGE_TAG=${BUNDLE_AND_INDEX_TAG} BUNDLE_TAG=${BUNDLE_AND_INDEX_TAG} QUAY_NAMESPACE=${QUAY_NAMESPACE} IMAGE=${OPERATOR_IMAGE_LOC}
     fi
 else
     INDEX_IMAGE_LOC="quay.io/codeready-toolchain/member-operator-index:latest"
-    if [[ "${ENVIRONMENT}" == "ui-e2e-tests" ]]; then
-        INDEX_IMAGE_LOC="quay.io/codeready-toolchain/member-operator-ui-e2e-tests-index:latest"
-    fi
 fi
 
 
 if [[ ${INSTALL_OPERATOR} == "true" ]]; then
     OPERATOR_RESOURCE_NAME=member-operator
     OPERATOR_NAME=toolchain-member-operator
     INDEX_IMAGE_NAME=member-operator-index
-    if [[ "${ENVIRONMENT}" == "ui-e2e-tests" ]]; then
-        INDEX_IMAGE_NAME=member-operator-ui-e2e-tests-index
-    fi
     NAMESPACE=${MEMBER_NS}
     EXPECT_CRD=memberoperatorconfigs.toolchain.dev.openshift.com
     install_operator

scripts/ci/manage-host-operator.sh

@@ -46,18 +46,11 @@ set_tags() {
 
 push_image() {
     GIT_COMMIT_ID=$(git --git-dir=${REPOSITORY_PATH}/.git --work-tree=${REPOSITORY_PATH} rev-parse --short HEAD)
-    
-    REPO_NAME_FOR_IMAGE=${REPOSITORY_NAME}
-    # Use different repository name for ui-e2e-tests environment
-    if [[ "${ENVIRONMENT}" == "ui-e2e-tests" ]]; then
-        REPO_NAME_FOR_IMAGE="${REPOSITORY_NAME}-ui-e2e-tests"
-    fi
-    
-    IMAGE_LOC=quay.io/codeready-toolchain/${REPO_NAME_FOR_IMAGE}:${GIT_COMMIT_ID}
+    IMAGE_LOC=quay.io/codeready-toolchain/${REPOSITORY_NAME}:${GIT_COMMIT_ID}
     if is_provided_or_paired; then
         IMAGE_BUILDER=${IMAGE_BUILDER:-"podman"}
         make -C ${REPOSITORY_PATH} ${IMAGE_BUILDER}-push QUAY_NAMESPACE=${QUAY_NAMESPACE} IMAGE_TAG=${TAGS}
-        IMAGE_LOC=quay.io/${QUAY_NAMESPACE}/${REPO_NAME_FOR_IMAGE}:${TAGS}
+        IMAGE_LOC=quay.io/${QUAY_NAMESPACE}/${REPOSITORY_NAME}:${TAGS}
     fi
 }