Skip to content

Commit 4d65f5a

Browse files
authored
fix(e2e): config namespace issue in upgrade test (#2598)
* Fix config namespace issue and missing variable
1 parent 277f4b8 commit 4d65f5a

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.ibm/pipelines/jobs/upgrade.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ handle_upgrade() {
44
export NAME_SPACE="showcase-upgrade-nightly"
55
export NAME_SPACE_POSTGRES_DB="${NAME_SPACE}-postgres-external-db"
66
export DEPLOYMENT_NAME="rhdh-backstage"
7+
export QUAY_REPO_BASE="rhdh/rhdh-hub-rhel9"
78
export TAG_NAME_BASE="1.4"
89
export HELM_CHART_VALUE_FILE_NAME_BASE="values_showcase_${TAG_NAME_BASE}.yaml"
910

10-
configure_namespace "${NAME_SPACE}"
11-
1211
oc_login
1312
echo "OCP version: $(oc version)"
1413
export K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')

.ibm/pipelines/utils.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -843,14 +843,16 @@ initiate_deployments() {
843843
# install base RHDH deployment before upgrade
844844
initiate_upgrade_base_deployments() {
845845
echo "Initiating base RHDH deployment before upgrade"
846+
847+
configure_namespace ${NAME_SPACE}
846848

847849
# Deploy redis cache db.
848850
oc apply -f "$DIR/resources/redis-cache/redis-deployment.yaml" --namespace="${NAME_SPACE}"
849851

850852
cd "${DIR}"
851853
local rhdh_base_url="https://${RELEASE_NAME}-backstage-${NAME_SPACE}.${K8S_CLUSTER_ROUTER_BASE}"
852854
apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
853-
echo "Deploying image from repository: ${QUAY_REPO_BASE}, TAG_NAME: ${TAG_NAME_BASE}, in NAME_SPACE: ${NAME_SPACE}"
855+
echo "Deploying image from base repository: ${QUAY_REPO_BASE}, TAG_NAME_BASE: ${TAG_NAME_BASE}, in NAME_SPACE: ${NAME_SPACE}"
854856

855857
helm upgrade -i "${RELEASE_NAME}" -n "${NAME_SPACE}" \
856858
"${HELM_REPO_NAME}/${HELM_IMAGE_NAME}" --version "${CHART_VERSION_BASE}" \

0 commit comments

Comments
 (0)