cleanup

awslabs · Nov 10, 2023 · 070f1ad · 070f1ad
1 parent f4fe6d4
commit 070f1ad
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -27,7 +27,7 @@ jobs:
     if: github.repository == 'awslabs/mountpoint-s3-csi-driver'
     strategy:
       matrix:
-        cluster-type: ["kops"]
+        cluster-type: ["kops-arm"]
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -80,31 +80,31 @@ jobs:
           export AWS_REGION=${{ env.AWS_REGION }}
           export CLUSTER_TYPE=${{ matrix.cluster-type }}
           tests/e2e-kubernetes/run.sh
-      - name: Install the driver
-        run: |
-          export ACTION=install_driver
-          export AWS_REGION=${{ env.AWS_REGION }}
-          export CLUSTER_TYPE=${{ matrix.cluster-type }}
-          export IMAGE_NAME=${{ env.TMP_IMAGE_NAME }}
-          export TAG=${{ env.COMMIT_ID }}
-          tests/e2e-kubernetes/run.sh
-      - name: Run E2E Tests
-        run: |
-          cd tests/e2e-kubernetes
-          export ACTION=run_tests
-          export AWS_REGION=${{ env.AWS_REGION }}
-          export CLUSTER_TYPE=${{ matrix.cluster-type }}
-          export TAG=${{ env.COMMIT_ID }}
-          ./run.sh
-      - name: Uinstall the driver
-        if: always()
-        run: |
-          export ACTION=uninstall_driver
-          export AWS_REGION=${{ env.AWS_REGION }}
-          export CLUSTER_TYPE=${{ matrix.cluster-type }}
-          tests/e2e-kubernetes/run.sh
+      # - name: Install the driver
+      #   run: |
+      #     export ACTION=install_driver
+      #     export AWS_REGION=${{ env.AWS_REGION }}
+      #     export CLUSTER_TYPE=${{ matrix.cluster-type }}
+      #     export IMAGE_NAME=${{ env.TMP_IMAGE_NAME }}
+      #     export TAG=${{ env.COMMIT_ID }}
+      #     tests/e2e-kubernetes/run.sh
+      # - name: Run E2E Tests
+      #   run: |
+      #     cd tests/e2e-kubernetes
+      #     export ACTION=run_tests
+      #     export AWS_REGION=${{ env.AWS_REGION }}
+      #     export CLUSTER_TYPE=${{ matrix.cluster-type }}
+      #     export TAG=${{ env.COMMIT_ID }}
+      #     ./run.sh
+      # - name: Uinstall the driver
+      #   if: always()
+      #   run: |
+      #     export ACTION=uninstall_driver
+      #     export AWS_REGION=${{ env.AWS_REGION }}
+      #     export CLUSTER_TYPE=${{ matrix.cluster-type }}
+      #     tests/e2e-kubernetes/run.sh
       - name: Delete cluster
-        if: always() && matrix.cluster-type == 'kops'
+        if: always() && (matrix.cluster-type == 'kops' || matrix.cluster-type == 'kops-arm')
         run: |
           export ACTION=delete_cluster
           export AWS_REGION=${{ env.AWS_REGION }}

diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml
@@ -5,4 +5,4 @@ resources:
 images:
 - name: csi-driver
   newName: 151381207180.dkr.ecr.eu-west-1.amazonaws.com/s3-csi-driver
-  newTag: v0.1.0
+  newTag: jk-testing-4-linux-arm64-amazon
diff --git a/tests/e2e-kubernetes/run.sh b/tests/e2e-kubernetes/run.sh
@@ -26,7 +26,7 @@ KUBECTL_BIN=${KUBECTL_INSTALL_PATH}/kubectl
 
 CLUSTER_TYPE=${CLUSTER_TYPE:-kops}
 # CLUSTER_NAME="s3-csi-cluster-${CLUSTER_TYPE}.k8s.local"
-CLUSTER_NAME="s3-csi-cluster-kops-24945.k8s.local"
+CLUSTER_NAME="s3-csi-cluster.kops-arm.k8s.local"
 if [[ "${CLUSTER_TYPE}" == "eksctl" ]]; then
   CLUSTER_NAME="s3-csi-cluster"
 fi