Make go-compatibility presubmits opt-in and non-blocking, set origina…

…l GO_VERSION
kubernetes · Feb 3, 2023 · f029e12 · f029e12
1 parent 95e1014
commit f029e12
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 11 deletions.
diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.23.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.23.yaml
@@ -1600,7 +1600,8 @@ presubmits:
             memory: 15Gi
         securityContext:
           privileged: true
-  - always_run: true
+  - always_run: false
+    optional: true
     branches:
     - release-1.23
     cluster: k8s-infra-prow-build
@@ -1609,6 +1610,8 @@ presubmits:
     labels:
       preset-dind-enabled: "true"
       preset-service-account: "true"
+    annotations:
+      description: run with GO_VERSION set to the original go version used for this branch
     name: pull-kubernetes-integration-go-compatibility
     path_alias: k8s.io/kubernetes
     spec:
@@ -1617,6 +1620,9 @@ presubmits:
         - ./hack/jenkins/test-dockerized.sh
         command:
         - runner.sh
+        env:
+        - name: GO_VERSION
+          value: "1.17.3"
         image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-1.23
         name: ""
         resources:
@@ -1776,21 +1782,27 @@ presubmits:
             memory: 36Gi
       securityContext:
         runAsUser: 2000
-  - always_run: true
+  - always_run: false
+    optional: true
     branches:
     - release-1.23
     cluster: k8s-infra-prow-build
     context: pull-kubernetes-unit-go-compatibility
     decorate: true
     labels:
       preset-service-account: "true"
+    annotations:
+      description: run with GO_VERSION set to the original go version used for this branch
     name: pull-kubernetes-unit-go-compatibility
     path_alias: k8s.io/kubernetes
     spec:
       containers:
       - command:
         - make
         - test
+        env:
+        - name: GO_VERSION
+          value: "1.17.3"
         image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-1.23
         name: ""
         resources:

diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.24.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.24.yaml
@@ -1420,7 +1420,8 @@ presubmits:
             memory: 15Gi
         securityContext:
           privileged: true
-  - always_run: true
+  - always_run: false
+    optional: true
     branches:
     - release-1.24
     cluster: k8s-infra-prow-build
@@ -1429,6 +1430,8 @@ presubmits:
     labels:
       preset-dind-enabled: "true"
       preset-service-account: "true"
+    annotations:
+      description: run with GO_VERSION set to the original go version used for this branch
     name: pull-kubernetes-integration-go-compatibility
     path_alias: k8s.io/kubernetes
     spec:
@@ -1437,6 +1440,9 @@ presubmits:
         - ./hack/jenkins/test-dockerized.sh
         command:
         - runner.sh
+        env:
+        - name: GO_VERSION
+          value: "1.18.1"
         image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-1.24
         name: ""
         resources:
@@ -1596,21 +1602,27 @@ presubmits:
             memory: 36Gi
       securityContext:
         runAsUser: 2000
-  - always_run: true
+  - always_run: false
+    optional: true
     branches:
     - release-1.24
     cluster: k8s-infra-prow-build
     context: pull-kubernetes-unit-go-compatibility
     decorate: true
     labels:
       preset-service-account: "true"
+    annotations:
+      description: run with GO_VERSION set to the original go version used for this branch
     name: pull-kubernetes-unit-go-compatibility
     path_alias: k8s.io/kubernetes
     spec:
       containers:
       - command:
         - make
         - test
+        env:
+        - name: GO_VERSION
+          value: "1.18.1"
         image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-1.24
         name: ""
         resources:

diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.25.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.25.yaml
@@ -1430,7 +1430,8 @@ presubmits:
             memory: 15Gi
         securityContext:
           privileged: true
-  - always_run: true
+  - always_run: false
+    optional: true
     branches:
     - release-1.25
     cluster: k8s-infra-prow-build
@@ -1439,6 +1440,8 @@ presubmits:
     labels:
       preset-dind-enabled: "true"
       preset-service-account: "true"
+    annotations:
+      description: run with GO_VERSION set to the original go version used for this branch
     name: pull-kubernetes-integration-go-compatibility
     path_alias: k8s.io/kubernetes
     spec:
@@ -1447,6 +1450,9 @@ presubmits:
         - ./hack/jenkins/test-dockerized.sh
         command:
         - runner.sh
+        env:
+        - name: GO_VERSION
+          value: "1.19.1"
         image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-1.25
         name: ""
         resources:
@@ -1606,21 +1612,27 @@ presubmits:
             memory: 36Gi
       securityContext:
         runAsUser: 2000
-  - always_run: true
+  - always_run: false
+    optional: true
     branches:
     - release-1.25
     cluster: k8s-infra-prow-build
     context: pull-kubernetes-unit-go-compatibility
     decorate: true
     labels:
       preset-service-account: "true"
+    annotations:
+      description: run with GO_VERSION set to the original go version used for this branch
     name: pull-kubernetes-unit-go-compatibility
     path_alias: k8s.io/kubernetes
     spec:
       containers:
       - command:
         - make
         - test
+        env:
+        - name: GO_VERSION
+          value: "1.19.1"
         image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-1.25
         name: ""
         resources:

diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.26.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.26.yaml
@@ -1458,7 +1458,8 @@ presubmits:
             memory: 15Gi
         securityContext:
           privileged: true
-  - always_run: true
+  - always_run: false
+    optional: true
     branches:
     - release-1.26
     cluster: k8s-infra-prow-build
@@ -1467,6 +1468,8 @@ presubmits:
     labels:
       preset-dind-enabled: "true"
       preset-service-account: "true"
+    annotations:
+      description: run with GO_VERSION set to the original go version used for this branch
     name: pull-kubernetes-integration-go-compatibility
     path_alias: k8s.io/kubernetes
     spec:
@@ -1475,6 +1478,9 @@ presubmits:
         - ./hack/jenkins/test-dockerized.sh
         command:
         - runner.sh
+        env:
+        - name: GO_VERSION
+          value: "1.19.4"
         image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-1.26
         name: ""
         resources:
@@ -1632,21 +1638,27 @@ presubmits:
           requests:
             cpu: "4"
             memory: 36Gi
-  - always_run: true
+  - always_run: false
+    optional: true
     branches:
     - release-1.26
     cluster: k8s-infra-prow-build
     context: pull-kubernetes-unit-go-compatibility
     decorate: true
     labels:
       preset-service-account: "true"
+    annotations:
+      description: run with GO_VERSION set to the original go version used for this branch
     name: pull-kubernetes-unit-go-compatibility
     path_alias: k8s.io/kubernetes
     spec:
       containers:
       - command:
         - make
         - test
+        env:
+        - name: GO_VERSION
+          value: "1.19.4"
         image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-1.26
         name: ""
         resources:

diff --git a/config/jobs/kubernetes/sig-testing/integration.yaml b/config/jobs/kubernetes/sig-testing/integration.yaml
@@ -35,13 +35,15 @@ presubmits:
             memory: 15Gi
   - name: pull-kubernetes-integration-go-compatibility
     cluster: k8s-infra-prow-build
-    always_run: true
+    always_run: false
+    optional: true
     decorate: true
     skip_branches:
     - release-\d+.\d+ # per-release job
     annotations:
       fork-per-release: "true"
       testgrid-dashboards: sig-testing-canaries
+      description: run with GO_VERSION set to the original go version used for this branch
     path_alias: k8s.io/kubernetes
     labels:
       preset-service-account: "true"
@@ -51,6 +53,9 @@ presubmits:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-master
         command:
         - runner.sh
+        env:
+        - name: GO_VERSION
+          value: ""
         args:
         - ./hack/jenkins/test-dockerized.sh
         # docker-in-docker needs privileged mode

diff --git a/config/jobs/kubernetes/sig-testing/make-test.yaml b/config/jobs/kubernetes/sig-testing/make-test.yaml
@@ -39,14 +39,15 @@ presubmits:
     annotations:
       fork-per-release: "true"
       testgrid-dashboards: sig-testing-canaries
+      description: run with GO_VERSION set to the original go version used for this branch
     decorate: true
     cluster: k8s-infra-prow-build
     skip_branches:
     - release-\d+.\d+ # per-release job
     labels:
       preset-service-account: "true"
-    optional: false
-    always_run: true
+    optional: true
+    always_run: false
     path_alias: k8s.io/kubernetes
     spec:
       # unit tests have no business requiring root or doing privileged operations
@@ -62,6 +63,9 @@ presubmits:
           command:
             - make
             - test
+          env:
+          - name: GO_VERSION
+            value: ""
           # TODO: direct copy from pull-kubernetes-bazel-test, tune these
           resources:
             limits: