From 0561fe120f7b38a9ff93f9cc4b8c5811710d1b7d Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Wed, 15 Sep 2021 10:50:33 -0700 Subject: [PATCH] config/jobs: rm some k8s-testimages push jobs Specifically, drop -canary from the jobs that push to k8s-staging-test-infra, and remove the old jobs that push to k8s-testimages for: - bigquery - bootstrap - gcloud-in-go - image-builder - krte - kubekins-e2e Also, drop cluster-api push job, since the image has been removed in favor of kubekins-e2e --- .../image-pushing/k8s-staging-test-infra.yaml | 42 ++--- .../test-infra/test-infra-trusted.yaml | 168 ------------------ 2 files changed, 21 insertions(+), 189 deletions(-) diff --git a/config/jobs/image-pushing/k8s-staging-test-infra.yaml b/config/jobs/image-pushing/k8s-staging-test-infra.yaml index 7d7a2ba60432..9ea8c5517193 100644 --- a/config/jobs/image-pushing/k8s-staging-test-infra.yaml +++ b/config/jobs/image-pushing/k8s-staging-test-infra.yaml @@ -3,13 +3,13 @@ postsubmits: # # job images, e.g. images/* # - - name: post-test-infra-push-bigquery-canary + - name: post-test-infra-push-bigquery cluster: k8s-infra-prow-build-trusted run_if_changed: '^(images/bigquery|scenarios)/' annotations: - testgrid-dashboards: sig-testing-canaries, wg-k8s-infra-canaries, wg-k8s-infra-gcb - testgrid-tab-name: bigquery-canary - testgrid-alert-email: k8s-infra-alerts@kubernetes.io + testgrid-dashboards: sig-testing-images, wg-k8s-infra-gcb + testgrid-tab-name: bigquery + testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-alerts@kubernetes.io testgrid-num-failures-to-alert: '1' description: builds and pushes the bigquery image decorate: true @@ -27,13 +27,13 @@ postsubmits: - --project=k8s-staging-test-infra - --build-dir=. - images/bigquery/ - - name: post-test-infra-push-bootstrap-canary + - name: post-test-infra-push-bootstrap cluster: k8s-infra-prow-build-trusted run_if_changed: '^(images/bootstrap|scenarios)/' annotations: - testgrid-dashboards: sig-testing-canaries, wg-k8s-infra-canaries, wg-k8s-infra-gcb - testgrid-tab-name: bootstrap-canary - testgrid-alert-email: k8s-infra-alerts@kubernetes.io + testgrid-dashboards: sig-testing-images, wg-k8s-infra-gcb + testgrid-tab-name: bootstrap + testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-alerts@kubernetes.io testgrid-num-failures-to-alert: '1' description: builds and pushes the bootstrap image decorate: true @@ -51,13 +51,13 @@ postsubmits: - --project=k8s-staging-test-infra - --build-dir=. - images/bootstrap/ - - name: post-test-infra-push-gcloud-in-go-canary + - name: post-test-infra-push-gcloud-in-go cluster: k8s-infra-prow-build-trusted run_if_changed: '^images/gcloud/' annotations: - testgrid-dashboards: sig-testing-canaries, wg-k8s-infra-canaries, wg-k8s-infra-gcb - testgrid-tab-name: gcloud-in-go-canary - testgrid-alert-email: k8s-infra-alerts@kubernetes.io + testgrid-dashboards: sig-testing-images, wg-k8s-infra-gcb + testgrid-tab-name: gcloud-in-go + testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-alerts@kubernetes.io testgrid-num-failures-to-alert: '1' description: builds and pushes the gcloud-in-go image decorate: true @@ -75,13 +75,13 @@ postsubmits: - --project=k8s-staging-test-infra - --build-dir=. - images/gcloud/ - - name: post-test-infra-push-image-builder-canary + - name: post-test-infra-push-image-builder cluster: k8s-infra-prow-build-trusted run_if_changed: '^images/builder/' annotations: - testgrid-dashboards: sig-testing-canaries, wg-k8s-infra-canaries, wg-k8s-infra-gcb - testgrid-tab-name: image-builder-canary - testgrid-alert-email: k8s-infra-alerts@kubernetes.io + testgrid-dashboards: sig-testing-images, wg-k8s-infra-gcb + testgrid-tab-name: image-builder + testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-alerts@kubernetes.io testgrid-num-failures-to-alert: '1' description: builds and pushes the image builder's own image decorate: true @@ -99,13 +99,13 @@ postsubmits: - --project=k8s-staging-test-infra - --build-dir=. - images/builder/ - - name: post-test-infra-push-krte-canary + - name: post-test-infra-push-krte cluster: k8s-infra-prow-build-trusted run_if_changed: '^images/(krte/|kubekins-e2e/variants.yaml)' annotations: - testgrid-dashboards: sig-testing-canaries, wg-k8s-infra-canaries, wg-k8s-infra-gcb - testgrid-tab-name: krte-canary - testgrid-alert-email: k8s-infra-alerts@kubernetes.io + testgrid-dashboards: sig-testing-images, wg-k8s-infra-gcb + testgrid-tab-name: krte + testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-alerts@kubernetes.io testgrid-num-failures-to-alert: '1' description: builds and pushes the krte image decorate: true @@ -128,7 +128,7 @@ postsubmits: annotations: testgrid-dashboards: sig-testing-images, wg-k8s-infra-gcb testgrid-tab-name: kubekins-e2e - testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-oncall@google.com, k8s-infra-alerts@kubernetes.io + testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-alerts@kubernetes.io testgrid-num-failures-to-alert: '1' description: builds and pushes the kubekins-e2e image run_if_changed: '^(images/kubekins-e2e|kubetest|boskos)/' diff --git a/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml b/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml index fb09fbf5cb76..1c4dbe70c538 100644 --- a/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml +++ b/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml @@ -310,78 +310,6 @@ postsubmits: - --project=k8s-testimages - --build-dir=. - images/bazel-krte/ - - name: post-test-infra-push-bigquery - cluster: test-infra-trusted - run_if_changed: '^images/bigquery/' - annotations: - testgrid-dashboards: "sig-testing-images" - testgrid-tab-name: "bigquery" - testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-oncall@google.com - testgrid-num-failures-to-alert: '1' - description: builds and pushes the bigquery image - decorate: true - branches: - - ^master$ - max_concurrency: 1 - spec: - serviceAccountName: deployer # TODO(fejta): should be pusher - containers: - - image: gcr.io/k8s-testimages/gcloud-bazel:v20210128-v0.6-11-gf1c6399 - command: - - images/builder/ci-runner.sh - args: - - --scratch-bucket=gs://k8s-testimages-scratch - - --project=k8s-testimages - - --build-dir=. - - images/bigquery/ - - name: post-test-infra-push-bootstrap - cluster: test-infra-trusted - run_if_changed: '^(images/bootstrap|scenarios)/' - annotations: - testgrid-dashboards: "sig-testing-images" - testgrid-tab-name: "bootstrap" - testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-oncall@google.com - testgrid-num-failures-to-alert: '1' - description: builds and pushes the bootstrap image - decorate: true - branches: - - ^master$ - max_concurrency: 1 - spec: - serviceAccountName: deployer # TODO(fejta): should be pusher - containers: - - image: gcr.io/k8s-testimages/gcloud-bazel:v20210128-v0.6-11-gf1c6399 - command: - - images/builder/ci-runner.sh - args: - - --scratch-bucket=gs://k8s-testimages-scratch - - --project=k8s-testimages - - --build-dir=. - - images/bootstrap/ - - name: post-test-infra-push-cluster-api - cluster: test-infra-trusted - run_if_changed: '^images/cluster-api/' - annotations: - testgrid-dashboards: "sig-testing-images" - testgrid-tab-name: "cluster-api" - testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-oncall@google.com - testgrid-num-failures-to-alert: '1' - description: builds and pushes the cluster-api image - decorate: true - branches: - - ^master$ - max_concurrency: 1 - spec: - serviceAccountName: deployer # TODO(fejta): should be pusher - containers: - - image: gcr.io/k8s-testimages/gcloud-bazel:v20210128-v0.6-11-gf1c6399 - command: - - images/builder/ci-runner.sh - args: - - --scratch-bucket=gs://k8s-testimages-scratch - - --project=k8s-testimages - - --build-dir=. - - images/cluster-api/ - name: post-test-infra-push-gcb-docker-gcloud cluster: test-infra-trusted run_if_changed: '^images/gcb-docker-gcloud/' @@ -406,78 +334,6 @@ postsubmits: - --project=k8s-testimages - --build-dir=. - images/gcb-docker-gcloud/ - - name: post-test-infra-push-gcloud - cluster: test-infra-trusted - run_if_changed: '^images/gcloud/' - annotations: - testgrid-dashboards: "sig-testing-images" - testgrid-tab-name: "gcloud" - testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-oncall@google.com - testgrid-num-failures-to-alert: '1' - description: builds and pushes the gcloud image - decorate: true - branches: - - ^master$ - max_concurrency: 1 - spec: - serviceAccountName: deployer # TODO(fejta): should be pusher - containers: - - image: gcr.io/k8s-testimages/gcloud-bazel:v20210128-v0.6-11-gf1c6399 - command: - - images/builder/ci-runner.sh - args: - - --scratch-bucket=gs://k8s-testimages-scratch - - --project=k8s-testimages - - --build-dir=. - - images/gcloud/ - - name: post-test-infra-push-kubekins-e2e-deprecated - cluster: test-infra-trusted - run_if_changed: '^(images/kubekins-e2e|kubetest|boskos)/' - annotations: - testgrid-dashboards: "sig-testing-images" - testgrid-tab-name: kubekins-e2e-deprecated - testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-oncall@google.com - testgrid-num-failures-to-alert: '1' - description: builds and pushes the kubekins-e2e image - decorate: true - branches: - - ^master$ - max_concurrency: 1 - spec: - serviceAccountName: deployer # TODO(fejta): should be pusher - containers: - - image: gcr.io/k8s-testimages/gcloud-bazel:v20210128-v0.6-11-gf1c6399 - command: - - images/builder/ci-runner.sh - args: - - --scratch-bucket=gs://k8s-testimages-scratch - - --project=k8s-testimages - - --build-dir=. - - images/kubekins-e2e/ - - name: post-test-infra-push-krte - cluster: test-infra-trusted - run_if_changed: '^images/(krte/|kubekins-e2e/variants.yaml)' - annotations: - testgrid-dashboards: "sig-testing-images" - testgrid-tab-name: "krte" - testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-oncall@google.com - testgrid-num-failures-to-alert: '1' - description: builds and pushes the krte image - decorate: true - branches: - - ^master$ - max_concurrency: 1 - spec: - serviceAccountName: deployer # TODO(fejta): should be pusher - containers: - - image: gcr.io/k8s-testimages/gcloud-bazel:v20210128-v0.6-11-gf1c6399 - command: - - images/builder/ci-runner.sh - args: - - --scratch-bucket=gs://k8s-testimages-scratch - - --project=k8s-testimages - - --build-dir=. - - images/krte/ - name: post-test-infra-push-kubemci cluster: test-infra-trusted run_if_changed: '^images/kubemci/' @@ -526,30 +382,6 @@ postsubmits: - --project=k8s-testimages - --build-dir=. - images/pull-test-infra-gubernator/ - - name: post-test-infra-push-image-builder - cluster: test-infra-trusted - run_if_changed: '^images/builder/' - annotations: - testgrid-dashboards: "sig-testing-images" - testgrid-tab-name: "image-builder" - testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-oncall@google.com - testgrid-num-failures-to-alert: '1' - description: builds and pushes the image builder's own image - decorate: true - branches: - - ^master$ - max_concurrency: 1 - spec: - serviceAccountName: deployer # TODO(fejta): should be pusher - containers: - - image: gcr.io/k8s-testimages/gcloud-bazel:v20210128-v0.6-11-gf1c6399 - command: - - images/builder/ci-runner.sh - args: - - --scratch-bucket=gs://k8s-testimages-scratch - - --project=k8s-testimages - - --build-dir=. - - images/builder/ - name: post-test-infra-push-image-benchmarkjunit cluster: test-infra-trusted run_if_changed: '^pkg/benchmarkjunit/'