From a8451a1f8eee8601a7147c3959377155a8812e1f Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Sat, 13 Mar 2021 15:39:22 +0100 Subject: [PATCH 1/7] releng: add presubmit prow job to test k8s-ci-builder image build --- .../kubernetes/release/release-config.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/config/jobs/kubernetes/release/release-config.yaml b/config/jobs/kubernetes/release/release-config.yaml index 29571fb80e58..2f48ce783fad 100644 --- a/config/jobs/kubernetes/release/release-config.yaml +++ b/config/jobs/kubernetes/release/release-config.yaml @@ -340,6 +340,42 @@ presubmits: testgrid-num-failures-to-alert: '10' testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' + - name: pull-release-image-k8s-ci-builder + optional: true + cluster: k8s-infra-prow-build + decorate: true + run_if_changed: '^images\/releng\/k8s-ci-builder\/' + path_alias: k8s.io/release + spec: + serviceAccountName: gcb-builder-releng-test + containers: + - image: gcr.io/k8s-testimages/image-builder:v20210302-aa40187 + command: + - /run.sh + args: + - --project=k8s-staging-releng-test + - --scratch-bucket=gs://k8s-staging-releng-test + - --build-dir=. + - --env-passthrough=REGISTRY + - images/releng/k8s-ci-builder + env: + - name: LOG_TO_STDOUT + value: "y" + - name: REGISTRY + value: "gcr.io/k8s-staging-releng-test" + resources: + requests: + cpu: 1000m + memory: 1Gi + limits: + cpu: 1000m + memory: 1Gi + annotations: + testgrid-dashboards: sig-release-releng-presubmits + testgrid-tab-name: release-image-k8s-ci-builder + testgrid-num-failures-to-alert: '10' + testgrid-alert-email: release-managers+alerts@kubernetes.io + testgrid-num-columns-recent: '30' periodics: # package tests - name: periodic-release-verify-packages-debs From c48074122adc4bdfe31e0a2f7637375ac5527390 Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Sat, 13 Mar 2021 15:39:50 +0100 Subject: [PATCH 2/7] releng: Update k8s-ci-builder image postsubmit to push to the correct staging project also run it only if the directory changed --- config/jobs/image-pushing/releng/k8s-staging-releng.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/jobs/image-pushing/releng/k8s-staging-releng.yaml b/config/jobs/image-pushing/releng/k8s-staging-releng.yaml index ae23b0e5f443..e14d03543c2e 100644 --- a/config/jobs/image-pushing/releng/k8s-staging-releng.yaml +++ b/config/jobs/image-pushing/releng/k8s-staging-releng.yaml @@ -77,6 +77,7 @@ postsubmits: testgrid-dashboards: sig-release-releng-informing, sig-release-image-pushes testgrid-alert-email: release-managers+alerts@kubernetes.io decorate: true + run_if_changed: '^(cmd\/|compile-release-tools|go.(mod|sum)|images\/releng\/k8s-ci-builder\/|pkg\/)' branches: - ^master$ spec: @@ -88,11 +89,14 @@ postsubmits: args: - --project=k8s-staging-releng - --scratch-bucket=gs://k8s-staging-releng-gcb + - --env-passthrough=REGISTRY - --build-dir=. - images/releng/k8s-ci-builder env: - name: LOG_TO_STDOUT value: "y" + - name: REGISTRY + value: "gcr.io/k8s-staging-build-image" rerun_auth_config: github_team_ids: - 2241179 # release-managers From 9b8293943a55ef18348f5c022d165b2c45f355e6 Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Sat, 13 Mar 2021 15:45:21 +0100 Subject: [PATCH 3/7] releng: add presubmit prow job to test releng-ci image build --- .../kubernetes/release/release-config.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/config/jobs/kubernetes/release/release-config.yaml b/config/jobs/kubernetes/release/release-config.yaml index 2f48ce783fad..61aca6adb45a 100644 --- a/config/jobs/kubernetes/release/release-config.yaml +++ b/config/jobs/kubernetes/release/release-config.yaml @@ -376,6 +376,42 @@ presubmits: testgrid-num-failures-to-alert: '10' testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' + - name: pull-release-image-releng-ci + optional: false + cluster: k8s-infra-prow-build + decorate: true + run_if_changed: '^images\/releng\/ci\/' + path_alias: k8s.io/release + spec: + serviceAccountName: gcb-builder-releng-test + containers: + - image: gcr.io/k8s-testimages/image-builder:v20210302-aa40187 + command: + - /run.sh + args: + - --project=k8s-staging-releng-test + - --scratch-bucket=gs://k8s-staging-releng-test + - --env-passthrough=PULL_BASE_REF,REGISTRY + - --build-dir=. + - images/releng/ci + env: + - name: LOG_TO_STDOUT + value: "y" + - name: REGISTRY + value: "gcr.io/k8s-staging-releng-test" + resources: + requests: + cpu: 1000m + memory: 1Gi + limits: + cpu: 1000m + memory: 1Gi + annotations: + testgrid-dashboards: sig-release-releng-presubmits + testgrid-tab-name: release-image-releng-ci + testgrid-num-failures-to-alert: '10' + testgrid-alert-email: release-managers+alerts@kubernetes.io + testgrid-num-columns-recent: '30' periodics: # package tests - name: periodic-release-verify-packages-debs From 7c46f2c35ec460d6ce6c8e331c3ed384bd5945f5 Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Sat, 13 Mar 2021 15:45:40 +0100 Subject: [PATCH 4/7] releng: Update releng-ci image postsubmit to push to the correct staging project --- config/jobs/image-pushing/releng/k8s-staging-releng.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/jobs/image-pushing/releng/k8s-staging-releng.yaml b/config/jobs/image-pushing/releng/k8s-staging-releng.yaml index e14d03543c2e..8568ef4b4b43 100644 --- a/config/jobs/image-pushing/releng/k8s-staging-releng.yaml +++ b/config/jobs/image-pushing/releng/k8s-staging-releng.yaml @@ -146,12 +146,14 @@ postsubmits: args: - --project=k8s-staging-releng - --scratch-bucket=gs://k8s-staging-releng-gcb - - --env-passthrough=PULL_BASE_REF + - --env-passthrough=PULL_BASE_REF,REGISTRY - --build-dir=. - images/releng/ci env: - name: LOG_TO_STDOUT value: "y" + - name: REGISTRY + value: "gcr.io/k8s-staging-build-image" rerun_auth_config: github_team_ids: - 2241179 # release-managers From 528bacb07b4ab5ae3fa2a124fdc7c59ad32b1672 Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Sat, 13 Mar 2021 15:57:01 +0100 Subject: [PATCH 5/7] releng: add presubmit prow job to test kubepkg image build --- .../kubernetes/release/release-config.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/config/jobs/kubernetes/release/release-config.yaml b/config/jobs/kubernetes/release/release-config.yaml index 61aca6adb45a..694eeb146c07 100644 --- a/config/jobs/kubernetes/release/release-config.yaml +++ b/config/jobs/kubernetes/release/release-config.yaml @@ -412,6 +412,42 @@ presubmits: testgrid-num-failures-to-alert: '10' testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' + - name: pull-release-image-kubepkg + optional: false + cluster: k8s-infra-prow-build + decorate: true + run_if_changed: 'cloudbuild-kubepkg.yaml|Dockerfile-kubepkg*' + path_alias: k8s.io/release + spec: + serviceAccountName: gcb-builder-releng-test + containers: + - image: gcr.io/k8s-testimages/image-builder:v20210302-aa40187 + command: + - /run.sh + args: + - --project=k8s-staging-releng-test + - --scratch-bucket=gs://k8s-staging-releng-test + - --env-passthrough=PULL_BASE_REF,REGISTRY + - --gcb-config=./cloudbuild-kubepkg.yaml + - . + env: + - name: LOG_TO_STDOUT + value: "y" + - name: REGISTRY + value: "gcr.io/k8s-staging-releng-test" + resources: + requests: + cpu: 1000m + memory: 1Gi + limits: + cpu: 1000m + memory: 1Gi + annotations: + testgrid-dashboards: sig-release-releng-presubmits + testgrid-tab-name: release-image-kubepkg + testgrid-num-failures-to-alert: '10' + testgrid-alert-email: release-managers+alerts@kubernetes.io + testgrid-num-columns-recent: '30' periodics: # package tests - name: periodic-release-verify-packages-debs From 77428766728a8827332b477aceb54c66473132f5 Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Sat, 13 Mar 2021 15:57:15 +0100 Subject: [PATCH 6/7] releng: Update kubepkg image postsubmit to push to the correct staging project --- config/jobs/image-pushing/releng/k8s-staging-releng.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/jobs/image-pushing/releng/k8s-staging-releng.yaml b/config/jobs/image-pushing/releng/k8s-staging-releng.yaml index 8568ef4b4b43..db50cbc7e44c 100644 --- a/config/jobs/image-pushing/releng/k8s-staging-releng.yaml +++ b/config/jobs/image-pushing/releng/k8s-staging-releng.yaml @@ -174,12 +174,14 @@ postsubmits: args: - --project=k8s-staging-releng - --scratch-bucket=gs://k8s-staging-releng-gcb - - --env-passthrough=PULL_BASE_REF + - --env-passthrough=PULL_BASE_REF,REGISTRY - --gcb-config=./cloudbuild-kubepkg.yaml - . env: - name: LOG_TO_STDOUT value: "y" + - name: REGISTRY + value: "gcr.io/k8s-staging-build-image" rerun_auth_config: github_team_ids: - 2241179 # release-managers From 007b2fffbbbd9f7a7ce25e82fe7840ff2c41759f Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Sat, 13 Mar 2021 15:58:27 +0100 Subject: [PATCH 7/7] releng: make all image builds job required to pass --- config/jobs/kubernetes/release/release-config.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/config/jobs/kubernetes/release/release-config.yaml b/config/jobs/kubernetes/release/release-config.yaml index 694eeb146c07..bdff33f0fdba 100644 --- a/config/jobs/kubernetes/release/release-config.yaml +++ b/config/jobs/kubernetes/release/release-config.yaml @@ -89,7 +89,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-kube-cross - optional: true cluster: k8s-infra-prow-build decorate: true run_if_changed: '^images\/build\/cross\/' @@ -125,7 +124,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-go-runner - optional: true cluster: k8s-infra-prow-build decorate: true run_if_changed: '^images\/build\/go-runner\/' @@ -161,7 +159,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-debian-base - optional: true cluster: k8s-infra-prow-build decorate: true run_if_changed: '^images\/build\/debian-base\/' @@ -197,7 +194,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-debian-hyperkube-base - optional: true cluster: k8s-infra-prow-build decorate: true run_if_changed: '^images\/build\/debian-hyperkube-base\/' @@ -233,7 +229,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-debian-iptables - optional: true cluster: k8s-infra-prow-build decorate: true run_if_changed: '^images\/build\/debian-iptables\/' @@ -269,7 +264,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-setcap - optional: true cluster: k8s-infra-prow-build decorate: true run_if_changed: '^images\/build\/setcap\/' @@ -305,7 +299,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-k8s-cloud-builder - optional: true cluster: k8s-infra-prow-build decorate: true run_if_changed: '^images\/k8s-cloud-builder\/' @@ -341,7 +334,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-k8s-ci-builder - optional: true cluster: k8s-infra-prow-build decorate: true run_if_changed: '^images\/releng\/k8s-ci-builder\/' @@ -377,7 +369,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-releng-ci - optional: false cluster: k8s-infra-prow-build decorate: true run_if_changed: '^images\/releng\/ci\/' @@ -413,7 +404,6 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io testgrid-num-columns-recent: '30' - name: pull-release-image-kubepkg - optional: false cluster: k8s-infra-prow-build decorate: true run_if_changed: 'cloudbuild-kubepkg.yaml|Dockerfile-kubepkg*'