Merge pull request #32177 from fabriziopandini/add-capv-vcsim-supervi…

…sor-e2e Add E2E for CAPV using vcsim in supervisor mode
kubernetes · Mar 7, 2024 · 2c2ff69 · 2c2ff69
2 parents 6b06bc2 + 0432c06
commit 2c2ff69
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 0 deletions.
diff --git a/...netes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-main-presubmits.yaml b/...netes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-main-presubmits.yaml
@@ -208,6 +208,7 @@ presubmits:
     - ^main$
     labels:
       preset-dind-enabled: "true"
+      preset-cluster-api-provider-vsphere-e2e-config: "true"
       preset-kind-volume-mounts: "true"
     always_run: false
     decorate: true
@@ -239,6 +240,43 @@ presubmits:
       testgrid-tab-name: pr-e2e-vcsim-govmomi-main
       description: Runs e2e tests with vcsim / govmomi mode
 
+  - name: pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main
+    branches:
+    - ^main$
+    labels:
+      preset-dind-enabled: "true"
+      preset-cluster-api-provider-vsphere-e2e-config: "true"
+      preset-kind-volume-mounts: "true"
+    always_run: false
+    decorate: true
+    decoration_config:
+      timeout: 180m
+    path_alias: sigs.k8s.io/cluster-api-provider-vsphere
+    max_concurrency: 3
+    spec:
+      containers:
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240223-1ded72f317-1.28
+        command:
+        - runner.sh
+        args:
+        - ./hack/e2e.sh
+        env:
+        - name: GINKGO_FOCUS
+          value: "\\[vcsim\\] \\[supervisor\\]"
+        # we need privileged mode in order to do docker in docker
+        securityContext:
+          privileged: true
+          capabilities:
+            add: ["NET_ADMIN"]
+        resources:
+          requests:
+            cpu: "4000m"
+            memory: "6Gi"
+    annotations:
+      testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
+      testgrid-tab-name: pr-e2e-vcsim-supervisor-main
+      description: Runs e2e tests with vcsim / supervisor mode
+
   - name: pull-cluster-api-provider-vsphere-e2e-upgrade-1-29-1-30-main
     labels:
       preset-dind-enabled: "true"

diff --git a/...s/cluster-api-provider-vsphere/templates/cluster-api-provider-vsphere-presubmits.yaml.tpl b/...s/cluster-api-provider-vsphere/templates/cluster-api-provider-vsphere-presubmits.yaml.tpl
@@ -207,6 +207,7 @@ presubmits:
     - ^{{ $.branch }}$
     labels:
       preset-dind-enabled: "true"
+      preset-cluster-api-provider-vsphere-e2e-config: "true"
       preset-kind-volume-mounts: "true"
     always_run: false
     decorate: true
@@ -237,6 +238,43 @@ presubmits:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-e2e-vcsim-govmomi-{{ ReplaceAll $.branch "." "-" }}
       description: Runs e2e tests with vcsim / govmomi mode
+
+  - name: pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-{{ ReplaceAll $.branch "." "-" }}
+    branches:
+    - ^{{ $.branch }}$
+    labels:
+      preset-dind-enabled: "true"
+      preset-cluster-api-provider-vsphere-e2e-config: "true"
+      preset-kind-volume-mounts: "true"
+    always_run: false
+    decorate: true
+    decoration_config:
+      timeout: 180m
+    path_alias: sigs.k8s.io/cluster-api-provider-vsphere
+    max_concurrency: 3
+    spec:
+      containers:
+      - image: {{ $.config.TestImage }}
+        command:
+        - runner.sh
+        args:
+        - ./hack/e2e.sh
+        env:
+        - name: GINKGO_FOCUS
+          value: "\\[vcsim\\] \\[supervisor\\]"
+        # we need privileged mode in order to do docker in docker
+        securityContext:
+          privileged: true
+          capabilities:
+            add: ["NET_ADMIN"]
+        resources:
+          requests:
+            cpu: "4000m"
+            memory: "6Gi"
+    annotations:
+      testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
+      testgrid-tab-name: pr-e2e-vcsim-supervisor-{{ ReplaceAll $.branch "." "-" }}
+      description: Runs e2e tests with vcsim / supervisor mode
 {{ end }}{{ if eq $.branch "release-1.5" "release-1.6" "release-1.7" "release-1.8" | not }}
   - name: pull-cluster-api-provider-vsphere-e2e-upgrade-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}
     labels: