CAPI: Optimize presubmit and periodic jobs

config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml

@@ -154,6 +154,55 @@ periodics:
     testgrid-tab-name: capi-e2e-dualstack-ipv6-main
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
+- name: periodic-cluster-api-e2e-ipv6-main
+  interval: 2h
+  decorate: true
+  decoration_config:
+    gcs_credentials_secret: "" # Use workload identity for uploading artifacts
+  rerun_auth_config:
+    github_team_slugs:
+      - org: kubernetes-sigs
+        slug: cluster-api-maintainers
+  labels:
+    preset-dind-enabled: "true"
+    preset-kind-volume-mounts: "true"
+  extra_refs:
+    - org: kubernetes-sigs
+      repo: cluster-api
+      base_ref: main
+      path_alias: sigs.k8s.io/cluster-api
+    - org: kubernetes
+      repo: kubernetes
+      base_ref: master
+      path_alias: k8s.io/kubernetes
+  spec:
+    serviceAccountName: prowjob-default-sa
+    containers:
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.27
+        args:
+          - runner.sh
+          - "./scripts/ci-e2e.sh"
+        env:
+          # enable IPV6 in bootstrap image
+          - name: "DOCKER_IN_DOCKER_IPV6_ENABLED"
+            value: "true"
+          - name: GINKGO_SKIP
+            value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
+          - name: GINKGO_FOCUS
+            value: "\\[IPv6\\] \\[PR-Informing\\]"
+          - name: IP_FAMILY
+            value: "IPv6"
+        # we need privileged mode in order to do docker in docker
+        securityContext:
+          privileged: true
+        resources:
+          requests:
+            cpu: 7300m
+  annotations:
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api
+    testgrid-tab-name: capi-e2e-ipv6-main
+    testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
+    testgrid-num-failures-to-alert: "4"
 - name: periodic-cluster-api-e2e-mink8s-main
   interval: 2h
   decorate: true

config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml

@@ -92,10 +92,11 @@ presubmits:
     decoration_config:
       gcs_credentials_secret: "" # Use workload identity for uploading artifacts
     path_alias: sigs.k8s.io/cluster-api
+    optional: true
+    always_run: false
     branches:
     # The script this job runs is not in all branches.
     - ^main$
-    run_if_changed: '^((api|bootstrap|cmd|config|controllers|controlplane|errors|exp|feature|hack|internal|scripts|test|util|webhooks|version)/|main\.go|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       serviceAccountName: prowjob-default-sa
       containers:
@@ -119,6 +120,44 @@ presubmits:
     annotations:
       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
+    path_alias: sigs.k8s.io/cluster-api
+    optional: true
+    always_run: false
+    branches:
+    # The script this job runs is not in all branches.
+    - ^main$
+    spec:
+      serviceAccountName: prowjob-default-sa
+      containers:
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230513-7e1db2f1bb-1.27
+        args:
+        - runner.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).
+        - 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
+    annotations:
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api
+      testgrid-tab-name: capi-pr-e2e-mink8s-main
   - name: pull-cluster-api-e2e-main
     labels:
       preset-dind-enabled: "true"
@@ -184,19 +223,19 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api
       testgrid-tab-name: capi-pr-e2e-informing-main
-  - name: pull-cluster-api-e2e-informing-ipv6-main
+  - name: pull-cluster-api-e2e-ipv6-main
     labels:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     decorate: true
     decoration_config:
       gcs_credentials_secret: "" # Use workload identity for uploading artifacts
     optional: true
+    always_run: false
     branches:
     # The script this job runs is not in all branches.
     - ^main$
     path_alias: sigs.k8s.io/cluster-api
-    run_if_changed: '^((api|bootstrap|cmd|config|controllers|controlplane|errors|exp|feature|hack|internal|scripts|test|util|webhooks|version)/|main\.go|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       serviceAccountName: prowjob-default-sa
       containers:
@@ -220,7 +259,7 @@ presubmits:
             cpu: 7300m
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api
-      testgrid-tab-name: capi-pr-e2e-informing-ipv6-main
+      testgrid-tab-name: capi-pr-e2e-ipv6-main
   - name: pull-cluster-api-e2e-full-dualstack-ipv6-main
     labels:
       preset-dind-enabled: "true"