review comments

canonical · Oct 23, 2024 · 2068096 · 2068096
1 parent 533bb54
commit 2068096
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -109,4 +109,4 @@ jobs:
           sudo sysctl fs.inotify.max_user_instances=8192
       - name: Run e2e tests
         run: |
-          sudo E2E_INFRA=docker GINKGO_FOCUS="${{ matrix.ginkgo_focus }}" SKIP_RESOURCE_CLEANUP=true make test-e2e
+          sudo GINKGO_FOCUS="${{ matrix.ginkgo_focus }}" SKIP_RESOURCE_CLEANUP=true make test-e2e
diff --git a/test/e2e/config/ck8s-aws.yaml b/test/e2e/config/ck8s-aws.yaml
@@ -91,7 +91,7 @@ variables:
   AWS_NODE_INSTANCE_TYPE: t3.large
   AWS_PUBLIC_IP: true
   AWS_CREATE_BASTION: true
-  AWS_SSH_KEY_NAME: "etienne"
+  AWS_SSH_KEY_NAME: "default"
   AWS_AMI_ID: "ami-01b139e6226d65e4f"
   AWS_CONTROL_PLANE_ROOT_VOLUME_SIZE: 16
   AWS_NODE_ROOT_VOLUME_SIZE: 16

diff --git a/test/e2e/data/infrastructure-aws/cluster-template.yaml b/test/e2e/data/infrastructure-aws/cluster-template.yaml
@@ -52,7 +52,7 @@ spec:
       name: ${CLUSTER_NAME}-control-plane
   spec:
     nodeName: "{{ ds.meta_data.local_hostname }}"
-    channel: "1.31-classic/edge"
+    channel: "{KUBERNETES_VERSION}-classic/edge"
     controlPlane:
       cloudProvider: external
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
@@ -122,7 +122,7 @@ spec:
   template:
     spec:
       nodeName: "{{ ds.meta_data.local_hostname }}"
-      channel: "1.31-classic/edge"
+      channel: "{KUBERNETES_VERSION}-classic/edge"
 ---
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet