From 8fb65f0ab901fdb67404772459ce5f8dc20130a5 Mon Sep 17 00:00:00 2001 From: Michael Valdron Date: Mon, 14 Jul 2025 14:48:25 -0400 Subject: [PATCH 1/3] fixes ginkgo version fetch Signed-off-by: Michael Valdron --- .ci/openshift_integration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/openshift_integration.sh b/.ci/openshift_integration.sh index 8738d769..23e29cfa 100755 --- a/.ci/openshift_integration.sh +++ b/.ci/openshift_integration.sh @@ -51,7 +51,7 @@ curl -sL https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift export GLOBALODOCONFIG=$(pwd)/preferences.yaml # Download & Install Ginkgo -GINKGO_VERSION="$(cd $BASE_DIR/tests/odov3 && go list -m -json all | ${YQ_PATH} 'select(.Path == "github.com/onsi/ginkgo/v2") | .Version' -Mr -p=json)" +GINKGO_VERSION="$(cd $BASE_DIR/tests/odov3 && go list -m -mod=readonly -json all | ${YQ_PATH} 'select(.Path == "github.com/onsi/ginkgo/v2") | .Version' -Mr -p=json)" go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} # Install the devfile registry From fca92ac87b4abbc3ae5079aa22130ead46755c3c Mon Sep 17 00:00:00 2001 From: Michael Valdron Date: Tue, 15 Jul 2025 01:34:06 -0400 Subject: [PATCH 2/3] fixes go install Signed-off-by: Michael Valdron --- .ci/openshift_integration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/openshift_integration.sh b/.ci/openshift_integration.sh index 23e29cfa..ee3c0fc6 100755 --- a/.ci/openshift_integration.sh +++ b/.ci/openshift_integration.sh @@ -52,7 +52,7 @@ export GLOBALODOCONFIG=$(pwd)/preferences.yaml # Download & Install Ginkgo GINKGO_VERSION="$(cd $BASE_DIR/tests/odov3 && go list -m -mod=readonly -json all | ${YQ_PATH} 'select(.Path == "github.com/onsi/ginkgo/v2") | .Version' -Mr -p=json)" -go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} +go install -mod=readonly github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} # Install the devfile registry oc process -f $BASE_DIR/.ci/deploy/devfile-registry.yaml -p DEVFILE_INDEX_IMAGE=$IMG -p IMAGE_TAG=$TAG -p REPLICAS=3 -p ANALYTICS_WRITE_KEY= | \ From 5c68973a52704c0d8564e70ab6334eae9a731fef Mon Sep 17 00:00:00 2001 From: Michael Valdron Date: Tue, 15 Jul 2025 08:16:07 -0400 Subject: [PATCH 3/3] fixes test suite runs Signed-off-by: Michael Valdron --- tests/check_odov3.sh | 2 +- tests/validate_devfile_schemas.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/check_odov3.sh b/tests/check_odov3.sh index c502e943..2cc47f7b 100755 --- a/tests/check_odov3.sh +++ b/tests/check_odov3.sh @@ -9,7 +9,7 @@ if [ ! -z "${1}" ]; then args="-odoPath ${1} ${args}" fi -ginkgo run --procs 2 \ +ginkgo run --mod=readonly --procs 2 \ --skip="stack: java-openliberty-gradle version: 0.4.0 starter: rest" \ --skip="stack: java-vertx version: 1.2.0 starter: vertx-cache-example-redhat" \ --skip="stack: java-vertx version: 1.2.0 starter: vertx-cache-example" \ diff --git a/tests/validate_devfile_schemas.sh b/tests/validate_devfile_schemas.sh index 6c838ce7..25f45497 100755 --- a/tests/validate_devfile_schemas.sh +++ b/tests/validate_devfile_schemas.sh @@ -49,5 +49,5 @@ if [ "${SAMPLES}" == "true" ]; then fi fi -ginkgo run --procs 2 \ +ginkgo run --mod=readonly --procs 2 \ tests/validate_devfile_schemas -- -stacksPath ${stacksDir} -stackDirs "$stackDirs"