Skip to content

Commit 2f18e52

Browse files
authored
Pin the version of OLM we use for e2e tests (openshift-service-mesh#450)
The latest release does not work, but 0.28.0 does. I also added some automation to update-deps to update the version. Signed-off-by: Daniel Grimm <[email protected]>
1 parent b56c95d commit 2f18e52

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

Makefile.core.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ OPERATOR_SDK_VERSION ?= v1.37.0
472472
HELM_VERSION ?= v3.16.2
473473
CONTROLLER_TOOLS_VERSION ?= v0.16.4
474474
OPM_VERSION ?= v1.47.0
475+
OLM_VERSION ?= 0.28.0
475476
GITLEAKS_VERSION ?= v8.21.1
476477
ISTIOCTL_VERSION ?= 1.23.0
477478

tests/e2e/common-operator-integ-suite.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,14 @@ if [ "${SKIP_BUILD}" == "false" ]; then
241241
BUNDLE_IMG="${BUNDLE_IMG}" \
242242
OPENSHIFT_PLATFORM=false \
243243
make bundle bundle-build bundle-push
244-
244+
245245
# Install OLM in the cluster because it's not available by default in kind.
246-
${OPERATOR_SDK} olm install
246+
OLM_INSTALL_ARGS=""
247+
if [ "${OLM_VERSION}" != "" ]; then
248+
OLM_INSTALL_ARGS+="--version ${OLM_VERSION}"
249+
fi
250+
# shellcheck disable=SC2086
251+
${OPERATOR_SDK} olm install ${OLM_INSTALL_ARGS}
247252

248253
# Wait for for the CatalogSource to be CatalogSource.status.connectionState.lastObservedState == READY
249254
${COMMAND} wait catalogsource operatorhubio-catalog -n olm --for 'jsonpath={.status.connectionState.lastObservedState}=READY' --timeout=5m

tools/update_deps.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ sed -i "s|CONTROLLER_TOOLS_VERSION ?= .*|CONTROLLER_TOOLS_VERSION ?= ${CONTROLLE
5858
OPM_LATEST_VERSION=$(getLatestVersion operator-framework/operator-registry)
5959
sed -i "s|OPM_VERSION ?= .*|OPM_VERSION ?= ${OPM_LATEST_VERSION}|" "${ROOTDIR}/Makefile.core.mk"
6060

61+
# Update olm
62+
OLM_LATEST_VERSION=$(getLatestVersion operator-framework/operator-lifecycle-manager)
63+
sed -i "s|OLM_VERSION ?= .*|OLM_VERSION ?= ${OLM_LATEST_VERSION}|" "${ROOTDIR}/Makefile.core.mk"
64+
6165
# Update kube-rbac-proxy
6266
RBAC_PROXY_LATEST_VERSION=$(getLatestVersion brancz/kube-rbac-proxy | cut -d/ -f1)
6367
# Only update it if the newer image is available in the registry

0 commit comments

Comments
 (0)