Skip to content

Commit ee0685a

Browse files
fix: OpenShift integration test failures (#623)
* fixes ginkgo version fetch Signed-off-by: Michael Valdron <[email protected]> * fixes go install Signed-off-by: Michael Valdron <[email protected]> * fixes test suite runs Signed-off-by: Michael Valdron <[email protected]> * pin go stack versions to fix non terminating go version error Signed-off-by: Michael Valdron <[email protected]> --------- Signed-off-by: Michael Valdron <[email protected]>
1 parent 08d595c commit ee0685a

File tree

14 files changed

+15
-15
lines changed

14 files changed

+15
-15
lines changed

.ci/openshift_integration.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ curl -sL https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift
5151
export GLOBALODOCONFIG=$(pwd)/preferences.yaml
5252

5353
# Download & Install Ginkgo
54-
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)"
55-
go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION}
54+
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)"
55+
go install -mod=readonly github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION}
5656

5757
# Install the devfile registry
5858
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= | \

stacks/go/1.0.2/devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ starterProjects:
1616
description: A Go project with a simple HTTP server
1717
git:
1818
checkoutFrom:
19-
revision: main
19+
revision: v1.0.2
2020
remotes:
2121
origin: https://github.com/devfile-samples/devfile-stack-go.git
2222
components:

stacks/go/1.1.0/devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ starterProjects:
1616
description: A Go project with a simple HTTP server
1717
git:
1818
checkoutFrom:
19-
revision: main
19+
revision: v1.1.0
2020
remotes:
2121
origin: https://github.com/devfile-samples/devfile-stack-go.git
2222
components:

stacks/go/1.2.0/devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ starterProjects:
1515
description: A Go project with a simple HTTP server
1616
git:
1717
checkoutFrom:
18-
revision: main
18+
revision: v1.2.0
1919
remotes:
2020
origin: https://github.com/devfile-samples/devfile-stack-go.git
2121
components:

stacks/go/1.2.1/devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ starterProjects:
1515
description: A Go project with a simple HTTP server
1616
git:
1717
checkoutFrom:
18-
revision: main
18+
revision: v1.2.1
1919
remotes:
2020
origin: https://github.com/devfile-samples/devfile-stack-go.git
2121
components:

stacks/go/1.3.0/devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ starterProjects:
1515
description: A Go project with a simple HTTP server
1616
git:
1717
checkoutFrom:
18-
revision: main
18+
revision: v1.3.0
1919
remotes:
2020
origin: https://github.com/devfile-samples/devfile-stack-go.git
2121
components:

stacks/go/1.3.1/devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ starterProjects:
1515
description: A Go project with a simple HTTP server
1616
git:
1717
checkoutFrom:
18-
revision: main
18+
revision: v1.3.1
1919
remotes:
2020
origin: https://github.com/devfile-samples/devfile-stack-go.git
2121
components:

stacks/go/2.0.0/devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ starterProjects:
1616
description: A Go project with a simple HTTP server
1717
git:
1818
checkoutFrom:
19-
revision: main
19+
revision: v2.0.0
2020
remotes:
2121
origin: https://github.com/devfile-samples/devfile-stack-go.git
2222
components:

stacks/go/2.1.0/devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ starterProjects:
1616
description: A Go project with a simple HTTP server
1717
git:
1818
checkoutFrom:
19-
revision: main
19+
revision: v2.1.0
2020
remotes:
2121
origin: https://github.com/devfile-samples/devfile-stack-go.git
2222
components:

stacks/go/2.2.0/devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ starterProjects:
1515
description: A Go project with a simple HTTP server
1616
git:
1717
checkoutFrom:
18-
revision: main
18+
revision: v2.2.0
1919
remotes:
2020
origin: https://github.com/devfile-samples/devfile-stack-go.git
2121
components:

0 commit comments

Comments
 (0)