Skip to content

Commit 801a798

Browse files
authored
Rollback automatic tag resolution on prod (#645)
1 parent 68703a5 commit 801a798

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

dp-terraform/helm/rhacs-terraform/terraform_cluster.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ case $ENVIRONMENT in
3535
# TODO Use downstream operator after downstream release 3.73.0
3636
OPERATOR_USE_UPSTREAM=true
3737
OPERATOR_VERSION="v3.73.0"
38+
39+
# Get the first non-merge commit, starting with HEAD.
40+
# On main this should be HEAD
41+
FLEETSHARD_SYNC_TAG="$(git rev-list --no-merges --max-count 1 --abbrev-commit --abbrev=7 HEAD)"
42+
"${SCRIPT_DIR}/check_image_exists.sh" "${FLEETSHARD_SYNC_TAG}"
3843
;;
3944

4045
prod)
@@ -44,6 +49,8 @@ case $ENVIRONMENT in
4449

4550
OPERATOR_USE_UPSTREAM=false
4651
OPERATOR_VERSION="v3.72.0"
52+
53+
FLEETSHARD_SYNC_TAG="1df0bc5"
4754
;;
4855

4956
*)
@@ -58,11 +65,6 @@ if [[ $CLUSTER_ENVIRONMENT != "$ENVIRONMENT" ]]; then
5865
exit 2
5966
fi
6067

61-
# Get the first non-merge commit, starting with HEAD.
62-
# On main this should be HEAD, on production, the latest merged main commit.
63-
FLEETSHARD_SYNC_TAG="$(git rev-list --no-merges --max-count 1 --abbrev-commit --abbrev=7 HEAD)"
64-
"${SCRIPT_DIR}/check_image_exists.sh" "${FLEETSHARD_SYNC_TAG}"
65-
6668
load_external_config "cluster-${CLUSTER_NAME}" CLUSTER_
6769
oc login --token="${CLUSTER_ROBOT_OC_TOKEN}" --server="$CLUSTER_URL"
6870

0 commit comments

Comments
 (0)