From c2e10352e4a2718d1a3450b782678a7024356ef9 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 15 Oct 2019 17:07:37 -0400 Subject: [PATCH] releng: Configure kubernetes-build prototype jobs to use the GCB builder The "image-builder" image now supports submitting "--no-source" GCB builds. This PR leverages the new builder image to mimic the kubernetes-build scenario via GCB instead of using the long-deprecated bootstrap image. Signed-off-by: Stephen Augustus --- .../k8s-staging-release-test.yaml | 74 +++++++++++++++++++ .../kubernetes/sig-release/shadow-builds.yaml | 66 ----------------- .../kubernetes/sig-release/config.yaml | 4 +- 3 files changed, 76 insertions(+), 68 deletions(-) delete mode 100644 config/jobs/kubernetes/sig-release/shadow-builds.yaml diff --git a/config/jobs/image-pushing/k8s-staging-release-test.yaml b/config/jobs/image-pushing/k8s-staging-release-test.yaml index 4e1ee4703dfb..c3189cdac190 100644 --- a/config/jobs/image-pushing/k8s-staging-release-test.yaml +++ b/config/jobs/image-pushing/k8s-staging-release-test.yaml @@ -1,3 +1,77 @@ +periodics: +- interval: 1h + name: ci-kubernetes-prototype-build + decorate: true + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: "k8s.io/release" + spec: + containers: + - image: gcr.io/k8s-testimages/image-builder:v20191022-f781192 + command: + - /run.sh + args: + - --project=k8s-staging-release-test + - --scratch-bucket=gs://k8s-staging-release-test-gcb + - --gcb-config=build.yaml + - --variant=build-ci + - --no-source + - gcb/ + env: + - name: GOOGLE_APPLICATION_CREDENTIALS + value: /creds/service-account.json + volumeMounts: + - name: creds + mountPath: /creds + volumes: + - name: creds + secret: + secretName: deployer-service-account + annotations: + fork-per-release: "true" + fork-per-release-generic-suffix: "true" + testgrid-dashboards: sig-release-prototype-master-blocking + testgrid-tab-name: build-master + testgrid-alert-email: release-managers@kubernetes.io + +- interval: 1h + name: ci-kubernetes-prototype-build-fast + decorate: true + extra_refs: + - org: kubernetes + repo: release + base_ref: master + path_alias: "k8s.io/release" + spec: + containers: + - image: gcr.io/k8s-testimages/image-builder:v20191022-f781192 + command: + - /run.sh + args: + - --project=k8s-staging-release-test + - --scratch-bucket=gs://k8s-staging-release-test-gcb + - --gcb-config=build.yaml + - --variant=build-ci-fast + - --no-source + - gcb/ + env: + - name: GOOGLE_APPLICATION_CREDENTIALS + value: /creds/service-account.json + volumeMounts: + - name: creds + mountPath: /creds + volumes: + - name: creds + secret: + secretName: deployer-service-account + annotations: + testgrid-dashboards: sig-release-prototype-master-blocking + testgrid-tab-name: build-master-fast + testgrid-alert-email: release-managers@kubernetes.io + description: 'Ends up running: make quick-release' + postsubmits: kubernetes/release: - name: post-release-push-image-k8s-cloud-builder diff --git a/config/jobs/kubernetes/sig-release/shadow-builds.yaml b/config/jobs/kubernetes/sig-release/shadow-builds.yaml deleted file mode 100644 index a72e8f899941..000000000000 --- a/config/jobs/kubernetes/sig-release/shadow-builds.yaml +++ /dev/null @@ -1,66 +0,0 @@ -periodics: -- interval: 1h - name: ci-kubernetes-shadow-build - labels: - preset-service-account: "true" - preset-dind-enabled: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/bootstrap:v20191021-5489305 - args: - - --repo=k8s.io/kubernetes - - --repo=k8s.io/release - - --root=/go/src - - --timeout=180 - - --scenario=kubernetes_build - - -- - - --release=k8s-staging-release-test - - --allow-dup - - --extra-publish-file=k8s-master - - --hyperkube - - --registry=gcr.io/k8s-staging-release-test - # docker-in-docker needs privileged mode - securityContext: - privileged: true - resources: - requests: - cpu: 4 - memory: "8Gi" - annotations: - fork-per-release: "true" - fork-per-release-replacements: "--extra-publish-file=k8s-master -> --extra-publish-file=k8s-beta" - fork-per-release-generic-suffix: "true" - testgrid-dashboards: sig-release-shadow-master-blocking - testgrid-tab-name: build-master - testgrid-alert-email: release-managers@kubernetes.io - -- interval: 5m - name: ci-kubernetes-shadow-build-fast - labels: - preset-service-account: "true" - preset-dind-enabled: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/bootstrap:v20191021-5489305 - args: - - --repo=k8s.io/kubernetes - - --repo=k8s.io/release - - --root=/go/src - - --timeout=30 - - --scenario=kubernetes_build - - -- - - --release=k8s-staging-release-test - - --allow-dup - - --fast - # docker-in-docker needs privileged mode - securityContext: - privileged: true - resources: - requests: - cpu: 4 - memory: "8Gi" - annotations: - testgrid-dashboards: sig-release-shadow-master-blocking - testgrid-tab-name: build-master-fast - testgrid-alert-email: release-managers@kubernetes.io - description: 'Ends up running: make quick-release' diff --git a/config/testgrids/kubernetes/sig-release/config.yaml b/config/testgrids/kubernetes/sig-release/config.yaml index 6008b393e048..64e2df813e47 100644 --- a/config/testgrids/kubernetes/sig-release/config.yaml +++ b/config/testgrids/kubernetes/sig-release/config.yaml @@ -21,7 +21,7 @@ dashboard_groups: - sig-release-misc - sig-release-publishing-bot - sig-release-release-notes-presubmits - - sig-release-shadow-master-blocking + - sig-release-prototype-master-blocking # Dashboards @@ -70,4 +70,4 @@ dashboards: - name: test test_group_name: pull-release-notes-test base_options: width=10 -- name: sig-release-shadow-master-blocking +- name: sig-release-prototype-master-blocking