Skip to content

Commit

Permalink
Bugfix-release 2023-04-04.3.2d936a1 (#933)
Browse files Browse the repository at this point in the history
## Description
<!-- Please include a summary of the change and a link to the JIRA
ticket. Please add any additional motivation and context as needed.
Screenshots are also welcome -->
* Cherry-pick #931 to fix probe deployment on prod.
  • Loading branch information
stehessel authored Apr 6, 2023
2 parents 3622f8f + 5429f36 commit 54705d8
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions deploy/helm/probe/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ ENVIRONMENT=$1
CLUSTER_NAME=$2
PROBE_IMAGE_ORG="rhacs-eng"
PROBE_IMAGE_NAME="blackbox-monitoring-probe-service"
# Get the first non-merge commit, starting with HEAD.
# On main this should be HEAD, on production, the latest merged main commit.
PROBE_IMAGE_TAG="$(git rev-list --no-merges --max-count 1 --abbrev-commit --abbrev=7 HEAD)"
# Get HEAD for both main and production. This is the latest merged commit.
PROBE_IMAGE_TAG="$(git rev-parse --short=7 HEAD)"
PROBE_IMAGE="quay.io/${PROBE_IMAGE_ORG}/${PROBE_IMAGE_NAME}:${PROBE_IMAGE_TAG}"

export AWS_PROFILE="$ENVIRONMENT"
Expand Down

0 comments on commit 54705d8

Please sign in to comment.