small fixes to get CI working

awslabs · Nov 10, 2023 · f4fe6d4 · f4fe6d4
1 parent 31defe2
commit f4fe6d4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 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", "kops-arm"]
+        cluster-type: ["kops"]
     runs-on: ubuntu-latest
     permissions:
       id-token: write

diff --git a/tests/e2e-kubernetes/kops.sh b/tests/e2e-kubernetes/kops.sh
@@ -54,7 +54,7 @@ function kops_create_cluster() {
   ${BIN} create --state "${KOPS_STATE_FILE}" -f "${CLUSTER_FILE}"
   ${BIN} update cluster --state "${KOPS_STATE_FILE}" "${CLUSTER_NAME}" --yes
   ${BIN} export kubecfg --state "${KOPS_STATE_FILE}" "${CLUSTER_NAME}" --admin --kubeconfig "${KUBECONFIG}"
-  ${BIN} validate cluster --state "${KOPS_STATE_FILE}" --wait 20m --kubeconfig "${KUBECONFIG}"
+  ${BIN} validate cluster --state "${KOPS_STATE_FILE}" --wait 15m --kubeconfig "${KUBECONFIG}"
 }
 
 function kops_cluster_exists() {

diff --git a/tests/e2e-kubernetes/run.sh b/tests/e2e-kubernetes/run.sh
@@ -25,7 +25,8 @@ EKSCTL_BIN=${BIN_DIR}/eksctl
 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-${CLUSTER_TYPE}.k8s.local"
+CLUSTER_NAME="s3-csi-cluster-kops-24945.k8s.local"
 if [[ "${CLUSTER_TYPE}" == "eksctl" ]]; then
   CLUSTER_NAME="s3-csi-cluster"
 fi