migrate gcp pd driver to k8s-infra-prow-build

Related to: - kubernetes#30277 Signed-off-by: Arnaud Meukam <[email protected]>
ameukam · Sep 19, 2023 · 6833db6 · 6833db6
1 parent 4d63d77
commit 6833db6
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 34 deletions.
diff --git a/config/jobs/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/config.yaml b/config/jobs/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/config.yaml
@@ -1,6 +1,7 @@
 presubmits:
   kubernetes-sigs/gcp-compute-persistent-disk-csi-driver:
   - name: pull-gcp-compute-persistent-disk-csi-driver-e2e
+    cluster: k8s-infra-prow-build
     always_run: true
     labels:
       preset-service-account: "true"
@@ -20,11 +21,19 @@ presubmits:
         env:
         - name: ZONE
           value: us-central1-c
+        resources:
+          limits:
+            cpu: 2
+            memory: "6Gi"
+          requests:
+            cpu: 2
+            memory: "6Gi"
     annotations:
       testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
       testgrid-tab-name: presubmit-gcp-compute-persistent-disk-csi-driver-e2e
       description: Kubernetes e2e tests for Kubernetes Master branch and Driver latest build
   - name: pull-gcp-compute-persistent-disk-csi-driver-sanity
+    cluster: k8s-infra-prow-build
     always_run: true
     labels:
       preset-service-account: "true"
@@ -40,11 +49,19 @@ presubmits:
         - "--scenario=execute"
         - "--" # end bootstrap args, scenario args below
         - "test/run-sanity.sh"
+        resources:
+          limits:
+            cpu: 2
+            memory: "6Gi"
+          requests:
+            cpu: 2
+            memory: "6Gi"
     annotations:
       testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
       testgrid-tab-name: presubmit-gcp-compute-persistent-disk-csi-driver-sanity
       description: Kubernetes sanity tests for Kubernetes Master branch and Driver latest build
   - name: pull-gcp-compute-persistent-disk-csi-driver-unit
+    cluster: k8s-infra-prow-build
     always_run: true
     labels:
       preset-service-account: "true"
@@ -60,11 +77,19 @@ presubmits:
         - "--scenario=execute"
         - "--" # end bootstrap args, scenario args below
         - "test/run-unit.sh"
+        resources:
+          limits:
+            cpu: 2
+            memory: "6Gi"
+          requests:
+            cpu: 2
+            memory: "6Gi"
     annotations:
       testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
       testgrid-tab-name: presubmit-gcp-compute-persistent-disk-csi-driver-unit
       description: Kubernetes unit tests for Kubernetes Master branch and Driver latest build
   - name: pull-gcp-compute-persistent-disk-csi-driver-verify
+    cluster: k8s-infra-prow-build
     always_run: true
     labels:
       preset-service-account: "true"
@@ -85,16 +110,18 @@ presubmits:
         securityContext:
           privileged: true
         resources:
+          limits:
+            cpu: 2
+            memory: "6Gi"
           requests:
-            # Peak usage was measured at 4.5 Gi
-            memory: "6000Mi"
-            # Peak cpu usage was measured at 2500m, average close to 1000m
-            cpu: 2000m
+            cpu: 2
+            memory: "6Gi"
     annotations:
       testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
       testgrid-tab-name: presubmit-gcp-compute-persistent-disk-csi-driver-verify
       description: Kubernetes verify tests for Kubernetes Master branch and Driver latest build
   - name: pull-gcp-compute-persistent-disk-csi-driver-kubernetes-integration
+    cluster: k8s-infra-prow-build
     always_run: true
     labels:
       preset-service-account: "true"
@@ -120,12 +147,12 @@ presubmits:
         securityContext:
           privileged: true
         resources:
+          limits:
+            cpu: 2
+            memory: "6Gi"
           requests:
-            # these are both a bit below peak usage during build
-            # this is mostly for building kubernetes
-            memory: "9000Mi"
-            # during the tests more like 3-20m is used
-            cpu: 2000m
+            cpu: 2
+            memory: "6Gi"
     annotations:
       testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
       testgrid-tab-name: presubmit-gcp-compute-persistent-disk-csi-driver-kubernetes-integration

diff --git a/...ompute-persistent-disk-csi-driver/gcp-compute-persistent-disk-csi-driver-postsubmits.yaml b/...ompute-persistent-disk-csi-driver/gcp-compute-persistent-disk-csi-driver-postsubmits.yaml
@@ -1,5 +1,6 @@
 periodics:
 - name: ci-gcp-compute-persistent-disk-csi-driver-release-staging-k8s-master-integration
+  cluster: k8s-infra-prow-build
   interval: 4h
   labels:
     preset-service-account: "true"
@@ -25,18 +26,19 @@ periodics:
       securityContext:
         privileged: true
       resources:
+        limits:
+          cpu: 2
+          memory: "6Gi"
         requests:
-          # these are both a bit below peak usage during build
-          # this is mostly for building kubernetes
-          memory: "9000Mi"
-          # during the tests more like 3-20m is used
-          cpu: 2000m
+          cpu: 2
+          memory: "6Gi"
   annotations:
     testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
     testgrid-tab-name: Kubernetes Master Driver Latest Release Candidate
     testgrid-alert-email: [email protected]
     description: Kubernetes Integration tests for Kubernetes Master branch, Driver latest Release Candidate, and Stable Sidecars. Used to test release candidates when a new release is being cut.
 - name: ci-gcp-compute-persistent-disk-csi-driver-latest-k8s-master-integration
+  cluster: k8s-infra-prow-build
   interval: 4h
   labels:
     preset-service-account: "true"
@@ -62,18 +64,19 @@ periodics:
       securityContext:
         privileged: true
       resources:
+        limits:
+          cpu: 2
+          memory: "6Gi"
         requests:
-          # these are both a bit below peak usage during build
-          # this is mostly for building kubernetes
-          memory: "9000Mi"
-          # during the tests more like 3-20m is used
-          cpu: 2000m
+          cpu: 2
+          memory: "6Gi"
   annotations:
     testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
     testgrid-tab-name: Kubernetes Master Driver Latest
     testgrid-alert-email: [email protected]
     description: Kubernetes Integration tests for Kubernetes Master branch, Driver latest build, and Stable Sidecars
 - name: ci-gcp-compute-persistent-disk-csi-driver-latest-k8s-master-integration-canary-sidecars
+  cluster: k8s-infra-prow-build
   interval: 4h
   labels:
     preset-service-account: "true"
@@ -99,12 +102,12 @@ periodics:
       securityContext:
         privileged: true
       resources:
+        limits:
+          cpu: 2
+          memory: "6Gi"
         requests:
-          # these are both a bit below peak usage during build
-          # this is mostly for building kubernetes
-          memory: "9000Mi"
-          # during the tests more like 3-20m is used
-          cpu: 2000m
+          cpu: 2
+          memory: "6Gi"
   annotations:
     testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
     testgrid-tab-name: Kubernetes Master Driver Latest Canary Sidecars

diff --git a/...cp-compute-persistent-disk-csi-driver/gcp-compute-persistent-disk-csi-driver-windows.yaml b/...cp-compute-persistent-disk-csi-driver/gcp-compute-persistent-disk-csi-driver-windows.yaml
@@ -1,5 +1,6 @@
 periodics:
 - name: ci-gce-pd-csi-driver-latest-k8s-master-windows-2019
+  cluster: k8s-infra-prow-build
   extra_refs:
   - org: kubernetes-sigs
     repo: gcp-compute-persistent-disk-csi-driver
@@ -35,19 +36,20 @@ periodics:
       securityContext:
         privileged: true
       resources:
+        limits:
+          cpu: 2
+          memory: "6Gi"
         requests:
-          # these are both a bit below peak usage during build
-          # this is mostly for building kubernetes
-          memory: "9000Mi"
-          # during the tests more like 3-20m is used
-          cpu: 2000m
+          cpu: 2
+          memory: "6Gi"
   annotations:
     testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
     testgrid-tab-name: ci-windows-2019-provider-gcp-compute-persistent-disk-csi-driver
     description: Kubernetes Integration tests for Kubernetes Master branch and Driver latest
 presubmits:
   kubernetes-sigs/gcp-compute-persistent-disk-csi-driver:
   - name: pull-gcp-compute-persistent-disk-csi-driver-e2e-windows-2019
+    cluster: k8s-infra-prow-build
     labels:
       preset-k8s-ssh: "true"
       preset-service-account: "true"
@@ -83,12 +85,12 @@ presubmits:
         securityContext:
           privileged: true
         resources:
+          limits:
+            cpu: 2
+            memory: "6Gi"
           requests:
-            # these are both a bit below peak usage during build
-            # this is mostly for building kubernetes
-            memory: "9000Mi"
-            # during the tests more like 3-20m is used
-            cpu: 2000m
+            cpu: 2
+            memory: "6Gi"
     annotations:
       testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
       testgrid-tab-name: windows-2019-presubmit-gcp-compute-persistent-disk-csi-driver