From 3e6f016e35e49859a43177ca5099dbc8bd1df3e6 Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Mon, 12 Jul 2021 10:12:09 +0300 Subject: [PATCH] fix: more DWCO version fixes in release scripts (#906) Signed-off-by: Mykhailo Kuznietsov --- make-release.sh | 4 ++-- olm/release-olm-files.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/make-release.sh b/make-release.sh index 81877da0a..a7e15bced 100755 --- a/make-release.sh +++ b/make-release.sh @@ -133,8 +133,8 @@ if ! grep -q "value: quay.io/eclipse/che-dashboard:$RELEASE" $filename; then # use ${RELEASE} instead of master wget https://raw.githubusercontent.com/eclipse-che/che-server/${RELEASE}/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties -q -O /tmp/che.properties - if ! grep -q "value: quay.io/che-incubator/devworkspace-che-operator:$RELEASE" $filename; then - echo "[ERROR] Unable to find devworkspace che operator image with version ${RELEASE} in the $filename"; exit 1 + if ! grep -q "value: quay.io/che-incubator/devworkspace-che-operator:$DEVWORKSPACE_CHE_OPERATOR_IMAGE_RELEASE" $filename; then + echo "[ERROR] Unable to find devworkspace che operator image with version ${DEVWORKSPACE_CHE_OPERATOR_IMAGE_RELEASE} in the $filename"; exit 1 fi plugin_broker_meta_image=$(cat /tmp/che.properties | grep che.workspace.plugin_broker.metadata.image | cut -d '=' -f2) diff --git a/olm/release-olm-files.sh b/olm/release-olm-files.sh index a263d79d6..62c90432e 100755 --- a/olm/release-olm-files.sh +++ b/olm/release-olm-files.sh @@ -93,7 +93,7 @@ do -e 's/imagePullPolicy: *Always/imagePullPolicy: IfNotPresent/' \ -e 's/"cheImageTag": *"next"/"cheImageTag": ""/' \ -e 's|quay.io/eclipse/che-dashboard:next|quay.io/eclipse/che-dashboard:'${RELEASE}'|' \ - -e 's|quay.io/che-incubator/devworkspace-che-operator:ci|quay.io/che-incubator/devworkspace-che-operator:'${RELEASE}'|' \ + -e 's|quay.io/che-incubator/devworkspace-che-operator:ci|quay.io/che-incubator/devworkspace-che-operator:'${DEVWORKSPACE_CHE_OPERATOR_IMAGE_RELEASE}'|' \ -e 's|"identityProviderImage": *"quay.io/eclipse/che-keycloak:next"|"identityProviderImage": ""|' \ -e 's|"devfileRegistryImage": *"quay.io/eclipse/che-devfile-registry:next"|"devfileRegistryImage": ""|' \ -e 's|"pluginRegistryImage": *"quay.io/eclipse/che-plugin-registry:next"|"pluginRegistryImage": ""|' \