Merge pull request #1083 from pohly/run-bundle-image-version

pohly · web-flow · commit 57c1ace98ac6 · 2022-08-11T16:52:09.000+02:00
test: only use --index-image for "run bundle"
diff --git a/test/start-operator.sh b/test/start-operator.sh
@@ -93,7 +93,7 @@ function deploy_using_olm() {
   # Deploy the operator
   # Pinning the image is a workaround for https://github.com/operator-framework/operator-registry/issues/984.
   ${BINDIR}/operator-sdk run bundle${upgrade} ${NAMESPACE} --timeout 5m ${TEST_LOCAL_REGISTRY}/pmem-csi-bundle:v${BUNDLE_VERSION} \
-           --index-image=quay.io/operator-framework/opm:v1.23.0 \
+           $(if ! [ "${upgrade}" ]; then echo '--index-image=quay.io/operator-framework/opm:v1.23.0'; fi) \
            $(if ${TEST_LOCAL_REGISTRY_SKIP_TLS}; then echo '--skip-tls'; fi)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ function deploy_using_olm() {`
`93`	`93`	`# Deploy the operator`
`94`	`94`	`# Pinning the image is a workaround for https://github.com/operator-framework/operator-registry/issues/984.`
`95`	`95`	`${BINDIR}/operator-sdk run bundle${upgrade} ${NAMESPACE} --timeout 5m ${TEST_LOCAL_REGISTRY}/pmem-csi-bundle:v${BUNDLE_VERSION} \`
`96`		`- --index-image=quay.io/operator-framework/opm:v1.23.0 \`
	`96`	`+ $(if ! [ "${upgrade}" ]; then echo '--index-image=quay.io/operator-framework/opm:v1.23.0'; fi) \`
`97`	`97`	`$(if ${TEST_LOCAL_REGISTRY_SKIP_TLS}; then echo '--skip-tls'; fi)`
`98`	`98`	`}`
`99`	`99`