Merge pull request #32731 from ivanvc/tune-etcd-presubmit-integration…

…-tests Tune etcd presubmit jobs
kubernetes · Jun 13, 2024 · a1430e9 · a1430e9
2 parents 8c840ee + cd68949
commit a1430e9
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/config/jobs/etcd/etcd-presubmits.yaml b/config/jobs/etcd/etcd-presubmits.yaml
@@ -55,7 +55,6 @@ presubmits:
 
   - name: pull-etcd-unit-test-386
     cluster: eks-prow-build-cluster
-    optional: true # remove this once the job is green
     always_run: true
     branches:
     - main
@@ -77,10 +76,10 @@ presubmits:
         resources:
           requests:
             cpu: "4"
-            memory: "4Gi"
+            memory: "2Gi"
           limits:
             cpu: "4"
-            memory: "4Gi"
+            memory: "2Gi"
 
   - name: pull-etcd-verify
     cluster: eks-prow-build-cluster
@@ -168,6 +167,7 @@ presubmits:
         - |
           set -euo pipefail
           make gofail-enable
+          export JUNIT_REPORT_DIR=${ARTIFACTS}
           GOOS=linux GOARCH=amd64 CPU=1 make test-integration
         resources:
           requests:
@@ -179,7 +179,6 @@ presubmits:
 
   - name: pull-etcd-integration-2-cpu-amd64
     cluster: eks-prow-build-cluster
-    optional: true # remove this once the job is green
     always_run: true
     branches:
     - main
@@ -198,18 +197,18 @@ presubmits:
         - |
           set -euo pipefail
           make gofail-enable
+          export JUNIT_REPORT_DIR=${ARTIFACTS}
           GOOS=linux GOARCH=amd64 CPU=2 make test-integration
         resources:
           requests:
-            cpu: "2"
-            memory: "8Gi"
+            cpu: "3"
+            memory: "3Gi"
           limits:
-            cpu: "2"
-            memory: "8Gi"
+            cpu: "3"
+            memory: "3Gi"
 
   - name: pull-etcd-integration-4-cpu-amd64
     cluster: eks-prow-build-cluster
-    optional: true # remove this once the job is green
     always_run: true
     branches:
     - main
@@ -228,14 +227,15 @@ presubmits:
         - |
           set -euo pipefail
           make gofail-enable
+          export JUNIT_REPORT_DIR=${ARTIFACTS}
           GOOS=linux GOARCH=amd64 CPU=4 make test-integration
         resources:
           requests:
-            cpu: "4"
-            memory: "8Gi"
+            cpu: "6"
+            memory: "3Gi"
           limits:
-            cpu: "4"
-            memory: "8Gi"
+            cpu: "6"
+            memory: "3Gi"
 
   - name: pull-etcd-robustness-amd64
     cluster: k8s-infra-prow-build