fix go version

awslabs · Oct 24, 2023 · fcb1fc0 · fcb1fc0
1 parent 5c2f9a2
commit fcb1fc0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -26,6 +26,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: 'go.mod'
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1

diff --git a/Makefile b/Makefile
@@ -67,7 +67,9 @@ test:
 e2e:
 	pushd tests/e2e-kubernetes; \
 	KUBECONFIG=${E2E_KUBECONFIG} go test -ginkgo.vv --bucket-region=${E2E_REGION} --pull-request=${E2E_PR}; \
-	popd
+	EXIT_CODE=$$?; \
+	popd; \
+	exit $$EXIT_CODE
 
 .PHONY: fmt
 fmt:

diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.21.1
+go 1.21
 
 use (
     ./tests/e2e-kubernetes

diff --git a/tests/e2e-kubernetes/go.mod b/tests/e2e-kubernetes/go.mod
@@ -1,6 +1,6 @@
 module github.com/awslabs/aws-s3-csi-driver/tests/e2e-kubernetes
 
-go 1.21.1
+go 1.21
 
 require (
 	github.com/onsi/ginkgo/v2 v2.9.4

diff --git a/tests/e2e-kubernetes/install.sh b/tests/e2e-kubernetes/install.sh
@@ -13,10 +13,15 @@ function setup_kubeconfig() {
     aws eks update-kubeconfig --region ${EKS_REGION} --name ${EKS_CLUSTER_NAME} --kubeconfig=${KUBECONFIG}
 }
 
-function check_pods() {
-    kubectl get pods -A --kubeconfig=${KUBECONFIG}
+function ensure_driver_not_installed() {
+    echo "not installed"
+}
+
+function install_driver() {
+    kubectl get pods -A
 }
 
 kubectl_install
 setup_kubeconfig
-check_pods
+ensure_driver_not_installed
+install_driver