Address review comments (sburinger)

kubernetes · May 30, 2023 · a177c55 · a177c55
1 parent 1b9f5db
commit a177c55
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml
@@ -189,7 +189,7 @@ periodics:
           - name: GINKGO_SKIP
             value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
           - name: GINKGO_FOCUS
-            value: "\\[IPv6\\]"
+            value: "\\[IPv6\\] \\[PR-Informing\\]"
           - name: IP_FAMILY
             value: "IPv6"
         # we need privileged mode in order to do docker in docker

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml
@@ -121,6 +121,9 @@ presubmits:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api
       testgrid-tab-name: capi-pr-test-mink8s-main
   - name: pull-cluster-api-e2e-mink8s-main
+    labels:
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
     decorate: true
     decoration_config:
       gcs_credentials_secret: "" # Use workload identity for uploading artifacts
@@ -136,19 +139,19 @@ presubmits:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.27
         args:
         - runner.sh
-        - ./scripts/ci-test.sh
+        - ./scripts/ci-e2e.sh
         env:
         - name: GINKGO_SKIP
           value: "\\[Conformance\\] \\[K8s-Upgrade\\]|\\[IPv6\\]"
         # This value determines the minimum Kubernetes
         # supported version for Cluster API management cluster
         # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
         # docs (look for minimum supported k8s version for management cluster, i.e N-3).
-        #
-        # To check the latest available envtest in Kubebuilder for the minor version we determined above, please
-        # refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
         - name: KUBERNETES_VERSION_MANAGEMENT
           value: "stable-1.24"
+        # we need privileged mode in order to do docker in docker
+        securityContext:
+          privileged: true
         resources:
           requests:
             cpu: 7300m
@@ -245,7 +248,7 @@ presubmits:
           - name: "DOCKER_IN_DOCKER_IPV6_ENABLED"
             value: "true"
           - name: GINKGO_FOCUS
-            value: "\\[IPv6\\]"
+            value: "\\[IPv6\\] \\[PR-Informing\\]"
           - name: IP_FAMILY
             value: "IPv6"
         # we need privileged mode in order to do docker in docker