diff --git a/.ci/openshift_integration.sh b/.ci/openshift_integration.sh index 8738d769e..ee3c0fc6a 100755 --- a/.ci/openshift_integration.sh +++ b/.ci/openshift_integration.sh @@ -51,8 +51,8 @@ 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)" -go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} +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 -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= | \ diff --git a/stacks/go/1.0.2/devfile.yaml b/stacks/go/1.0.2/devfile.yaml index cdd1b9a92..28ad706cc 100644 --- a/stacks/go/1.0.2/devfile.yaml +++ b/stacks/go/1.0.2/devfile.yaml @@ -16,7 +16,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v1.0.2 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/1.1.0/devfile.yaml b/stacks/go/1.1.0/devfile.yaml index ba1022dc8..fe094eb1c 100644 --- a/stacks/go/1.1.0/devfile.yaml +++ b/stacks/go/1.1.0/devfile.yaml @@ -16,7 +16,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v1.1.0 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/1.2.0/devfile.yaml b/stacks/go/1.2.0/devfile.yaml index fe0ca80d2..09611abd9 100644 --- a/stacks/go/1.2.0/devfile.yaml +++ b/stacks/go/1.2.0/devfile.yaml @@ -15,7 +15,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v1.2.0 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/1.2.1/devfile.yaml b/stacks/go/1.2.1/devfile.yaml index beccec2e8..96bd382a2 100644 --- a/stacks/go/1.2.1/devfile.yaml +++ b/stacks/go/1.2.1/devfile.yaml @@ -15,7 +15,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v1.2.1 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/1.3.0/devfile.yaml b/stacks/go/1.3.0/devfile.yaml index a2c2e5080..1bfa70748 100644 --- a/stacks/go/1.3.0/devfile.yaml +++ b/stacks/go/1.3.0/devfile.yaml @@ -15,7 +15,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v1.3.0 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/1.3.1/devfile.yaml b/stacks/go/1.3.1/devfile.yaml index 6305b978f..16ef7377c 100644 --- a/stacks/go/1.3.1/devfile.yaml +++ b/stacks/go/1.3.1/devfile.yaml @@ -15,7 +15,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v1.3.1 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/2.0.0/devfile.yaml b/stacks/go/2.0.0/devfile.yaml index 54aa5b447..a06bdf1c2 100644 --- a/stacks/go/2.0.0/devfile.yaml +++ b/stacks/go/2.0.0/devfile.yaml @@ -16,7 +16,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v2.0.0 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/2.1.0/devfile.yaml b/stacks/go/2.1.0/devfile.yaml index f3b5d1e0d..9a2774e52 100644 --- a/stacks/go/2.1.0/devfile.yaml +++ b/stacks/go/2.1.0/devfile.yaml @@ -16,7 +16,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v2.1.0 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/2.2.0/devfile.yaml b/stacks/go/2.2.0/devfile.yaml index 69ec50aa6..bf6ba1340 100644 --- a/stacks/go/2.2.0/devfile.yaml +++ b/stacks/go/2.2.0/devfile.yaml @@ -15,7 +15,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v2.2.0 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/2.3.0/devfile.yaml b/stacks/go/2.3.0/devfile.yaml index 7fdbec9f1..08a87bfff 100644 --- a/stacks/go/2.3.0/devfile.yaml +++ b/stacks/go/2.3.0/devfile.yaml @@ -15,7 +15,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v2.3.0 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/stacks/go/2.4.0/devfile.yaml b/stacks/go/2.4.0/devfile.yaml index ba32c9df6..584fab074 100644 --- a/stacks/go/2.4.0/devfile.yaml +++ b/stacks/go/2.4.0/devfile.yaml @@ -15,7 +15,7 @@ starterProjects: description: A Go project with a simple HTTP server git: checkoutFrom: - revision: main + revision: v2.4.0 remotes: origin: https://github.com/devfile-samples/devfile-stack-go.git components: diff --git a/tests/check_odov3.sh b/tests/check_odov3.sh index c502e9438..2cc47f7b4 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 6c838ce77..25f45497c 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"