Skip to content

Commit 8d51aab

Browse files
authored
removing the dash from after the tag in calls to getLatestImageTags.sh because it didn't save us from 3.13-12 and is now breaking things. (#1051)
1 parent 5460509 commit 8d51aab

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

dependencies/LATEST_IMAGES.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if [[ $DWNSTM_BRANCH != "devspaces-3."*"-rhel-8" ]] && [[ $DWNSTM_BRANCH != "dev
5656
fi
5757

5858
# STEP 1 :: regenerate image tag list in LATEST_IMAGES
59-
CMD="./product/getLatestImageTags.sh --quay -b ${DWNSTM_BRANCH} --tag ${VERSION}- --hide"
59+
CMD="./product/getLatestImageTags.sh --quay -b ${DWNSTM_BRANCH} --tag ${VERSION} --hide"
6060
# shellcheck disable=SC2086
6161
echo $CMD
6262
$CMD | tee dependencies/LATEST_IMAGES

product/copyDWOToQuay.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if [[ ! $PROD_VER ]]; then usage; exit 1; fi
6060
SCRIPT_DIR=$(cd "$(dirname "$0")" || exit; pwd)
6161

6262
# 1. use getLatestImageTags.sh to get latest bundle in an IIB - return: operator-bundle:0.16-5
63-
bundle=$(${SCRIPT_DIR}/getLatestImageTags.sh --osbs -c devworkspace-operator-bundle --tag "${PROD_VER}-")
63+
bundle=$(${SCRIPT_DIR}/getLatestImageTags.sh --osbs -c devworkspace-operator-bundle --tag "${PROD_VER}")
6464
if [[ ! $bundle ]]; then
6565
errorf "Could not compute latest bundle! "
6666
exit 2

product/copyIIBsToQuay.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ for OCP_VER in ${OCP_VERSIONS}; do
190190
fi
191191

192192
if [[ $VERBOSEFLAG == "-v" ]]; then
193-
echo "[DEBUG] LATEST DS OPERATOR BUNDLE = $(${getLatestImageTags} --osbs -c devspaces-operator-bundle --tag "${DS_VERSION}-")"
194-
echo "[DEBUG] LATEST DWO OPERATOR BUNDLE = $(${getLatestImageTags} --osbs -c devworkspace-operator-bundle --tag "${DWO_VERSION}-")"
193+
echo "[DEBUG] LATEST DS OPERATOR BUNDLE = $(${getLatestImageTags} --osbs -c devspaces-operator-bundle --tag "${DS_VERSION}")"
194+
echo "[DEBUG] LATEST DWO OPERATOR BUNDLE = $(${getLatestImageTags} --osbs -c devworkspace-operator-bundle --tag "${DWO_VERSION}")"
195195
echo "[DEBUG] Note that the above bundles might not yet exist for the latest IIB, if still being published."
196196
echo ""
197197
echo "[DEBUG] DS INDEX BUNDLE = ${LATEST_IIB}"

product/util2.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ fi
436436
return sh(
437437
returnStdout: true,
438438
// -b devspaces-3.0-rhel-8 -c devspaces/server-rhel8 --tag "3.0-" --quay
439-
script: './getLatestImageTags.sh -b ' + MIDSTM_BRANCH + ' -c "' + orgAndImage + '" --tag "' + tag + '-" --' + repo
439+
script: './getLatestImageTags.sh -b ' + MIDSTM_BRANCH + ' -c "' + orgAndImage + '" --tag "' + tag + '" --' + repo
440440
).trim()
441441
}
442442

0 commit comments

Comments
 (0)