From 90827418b241c5b607affe675cb2292a04d0da20 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 23 May 2023 15:00:58 -0400 Subject: [PATCH] Make unit and integration go-compatibility presubmits required --- .../jobs/kubernetes/sig-release/release-branch-jobs/1.24.yaml | 2 -- .../jobs/kubernetes/sig-release/release-branch-jobs/1.25.yaml | 2 -- .../jobs/kubernetes/sig-release/release-branch-jobs/1.26.yaml | 2 -- .../jobs/kubernetes/sig-release/release-branch-jobs/1.27.yaml | 2 -- config/jobs/kubernetes/sig-testing/integration.yaml | 3 +-- config/jobs/kubernetes/sig-testing/make-test.yaml | 3 +-- config/testgrids/kubernetes/presubmits/config.yaml | 3 +++ 7 files changed, 5 insertions(+), 12 deletions(-) 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 index e6d9c55cdc2c..060656ad9521 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.24.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.24.yaml @@ -1412,7 +1412,6 @@ presubmits: preset-dind-enabled: "true" preset-service-account: "true" name: pull-kubernetes-integration-go-compatibility - optional: true path_alias: k8s.io/kubernetes spec: containers: @@ -1590,7 +1589,6 @@ presubmits: labels: preset-service-account: "true" name: pull-kubernetes-unit-go-compatibility - optional: true path_alias: k8s.io/kubernetes spec: containers: 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 index f1c1693ac29b..67ff32c59af2 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.25.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.25.yaml @@ -1424,7 +1424,6 @@ presubmits: preset-dind-enabled: "true" preset-service-account: "true" name: pull-kubernetes-integration-go-compatibility - optional: true path_alias: k8s.io/kubernetes spec: containers: @@ -1602,7 +1601,6 @@ presubmits: labels: preset-service-account: "true" name: pull-kubernetes-unit-go-compatibility - optional: true path_alias: k8s.io/kubernetes spec: containers: 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 index 701069b31f08..ca1d7bcdc578 100755 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.26.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.26.yaml @@ -1453,7 +1453,6 @@ presubmits: preset-dind-enabled: "true" preset-service-account: "true" name: pull-kubernetes-integration-go-compatibility - optional: true path_alias: k8s.io/kubernetes spec: containers: @@ -1629,7 +1628,6 @@ presubmits: labels: preset-service-account: "true" name: pull-kubernetes-unit-go-compatibility - optional: true path_alias: k8s.io/kubernetes spec: containers: diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.27.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.27.yaml index 1807c8741120..51a4b4b18156 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.27.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.27.yaml @@ -1404,7 +1404,6 @@ presubmits: preset-dind-enabled: "true" preset-service-account: "true" name: pull-kubernetes-integration-go-compatibility - optional: true path_alias: k8s.io/kubernetes spec: containers: @@ -1583,7 +1582,6 @@ presubmits: labels: preset-service-account: "true" name: pull-kubernetes-unit-go-compatibility - optional: true path_alias: k8s.io/kubernetes spec: containers: diff --git a/config/jobs/kubernetes/sig-testing/integration.yaml b/config/jobs/kubernetes/sig-testing/integration.yaml index 0726570aed43..9afe30bc6865 100644 --- a/config/jobs/kubernetes/sig-testing/integration.yaml +++ b/config/jobs/kubernetes/sig-testing/integration.yaml @@ -36,14 +36,13 @@ presubmits: - name: pull-kubernetes-integration-go-compatibility cluster: k8s-infra-prow-build always_run: true - optional: true decorate: true skip_branches: - .* # per-release job annotations: fork-per-release: "true" fork-per-release-replacements: "GO_VERSION= -> GO_VERSION={{.GoVersion}}" - testgrid-dashboards: sig-testing-canaries + testgrid-create-test-group: 'true' description: run with GO_VERSION set to the original go version used for this branch path_alias: k8s.io/kubernetes labels: diff --git a/config/jobs/kubernetes/sig-testing/make-test.yaml b/config/jobs/kubernetes/sig-testing/make-test.yaml index d7346c7a078e..b3a3b5bbbc03 100644 --- a/config/jobs/kubernetes/sig-testing/make-test.yaml +++ b/config/jobs/kubernetes/sig-testing/make-test.yaml @@ -39,7 +39,7 @@ presubmits: annotations: fork-per-release: "true" fork-per-release-replacements: "GO_VERSION= -> GO_VERSION={{.GoVersion}}" - testgrid-dashboards: sig-testing-canaries + testgrid-dashboards: presubmits-kubernetes-blocking description: run with GO_VERSION set to the original go version used for this branch decorate: true cluster: k8s-infra-prow-build @@ -47,7 +47,6 @@ presubmits: - .* # per-release job labels: preset-service-account: "true" - optional: true always_run: true path_alias: k8s.io/kubernetes spec: diff --git a/config/testgrids/kubernetes/presubmits/config.yaml b/config/testgrids/kubernetes/presubmits/config.yaml index c8ea96c6764e..86647b67ef5e 100644 --- a/config/testgrids/kubernetes/presubmits/config.yaml +++ b/config/testgrids/kubernetes/presubmits/config.yaml @@ -37,6 +37,9 @@ dashboards: - name: pull-kubernetes-integration test_group_name: pull-kubernetes-integration base_options: width=10 + - name: pull-kubernetes-integration-go-compatibility + test_group_name: pull-kubernetes-integration-go-compatibility + base_options: width=10 - name: pull-kubernetes-verify test_group_name: pull-kubernetes-verify base_options: width=10