You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2022/06/01 02:09:40 UTC
[camel-k] 01/03: fix(ci): fix Upgrade E2E testing on CI
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 25b9790bc2c6ae5da875544f26adb7c2f8c4c10a
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Tue May 31 13:35:18 2022 +0900
fix(ci): fix Upgrade E2E testing on CI
Fix #3315
---
.github/actions/kamel-build-bundle/build-bundle-image.sh | 4 ++--
.github/actions/kamel-build-bundle/build-index-image.sh | 4 ++--
script/Makefile | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.github/actions/kamel-build-bundle/build-bundle-image.sh b/.github/actions/kamel-build-bundle/build-bundle-image.sh
index 575ada06d..4ad2e7b6e 100755
--- a/.github/actions/kamel-build-bundle/build-bundle-image.sh
+++ b/.github/actions/kamel-build-bundle/build-bundle-image.sh
@@ -106,9 +106,9 @@ popd
export LOCAL_IMAGE_BUNDLE=${REGISTRY_PUSH_HOST}/${IMAGE_NAMESPACE}/camel-k-bundle:${IMAGE_VERSION}
export CUSTOM_IMAGE=${IMAGE_NAME}
-export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po '\d.\d')"
+export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po '\d.\d+')"
echo "PREV_XY_CHANNEL=${PREV_XY_CHANNEL}" >> $GITHUB_ENV
-export NEW_XY_CHANNEL=stable-dev-$(make get-version | grep -Po "\d.\d")
+export NEW_XY_CHANNEL=stable-dev-$(make get-version | grep -Po "\d.\d+")
echo "NEW_XY_CHANNEL=${NEW_XY_CHANNEL}" >> $GITHUB_ENV
make bundle-build \
diff --git a/.github/actions/kamel-build-bundle/build-index-image.sh b/.github/actions/kamel-build-bundle/build-index-image.sh
index ecd5e4c1c..146d08ba4 100755
--- a/.github/actions/kamel-build-bundle/build-index-image.sh
+++ b/.github/actions/kamel-build-bundle/build-index-image.sh
@@ -211,10 +211,10 @@ cat << EOF >> ${CATALOG_DIR}/camel-k.yaml
---
schema: olm.channel
package: camel-k
-name: stable-dev-$(make get-version | grep -Po "\d.\d")
+name: stable-dev-$(make get-version | grep -Po "\d.\d+")
entries:
- name: $(make get-csv-name)
- replaces: $(make get-last-released-img-name).v$(make get-last-released-version | grep -Po "\d.\d.\d")
+ replaces: $(make get-last-released-img-name).v$(make get-last-released-version | grep -Po "\d.\d+.\d+")
EOF
#
diff --git a/script/Makefile b/script/Makefile
index 5fadb9154..9f41ca96e 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -524,6 +524,8 @@ pre-bundle:
@sed -i '/ version: ${CSV_VERSION}/a \ \ replaces: $(CSV_REPLACES)' $(CSV_PATH)
bundle: set-version generate-crd $(BUNDLE_CAMEL_APIS) kustomize operator-sdk pre-bundle
+ @# Display BUNDLE_METADATA_OPTS for debugging
+ $(info BUNDLE_METADATA_OPTS=$(BUNDLE_METADATA_OPTS))
@# Sets the operator image to the preferred image:tag
@cd config/manifests && $(KUSTOMIZE) edit set image $(IMAGE_NAME)=$(CUSTOM_IMAGE):$(CUSTOM_VERSION)
@# Build kustomize manifests