Skip to content

Commit

Permalink
config: add wg-k8s-infra-gcb dashboard to all image-pushing jobs
Browse files Browse the repository at this point in the history
This involves three sets of changes:
- adding the wg-k8s-infra-gcb dashboard to config/testgrids
- using edit-prowjobs.py to mass-edit all but one image-pushing job
- manually edit post-security-profiles-operator-push-image in
  k8s-staging-seccomp-operator.yaml to add a testgrid-dashboards
  annotation

The last change exposes the fact that there is no one-true-yaml that
defines both prowjobs and all of their testgrid dashboards. The job
has another testgrid dashboard tab defined in a testgrid config. It
can't be moved to the prowjob config as-is, because it has a custom
base_options setting for width, and acontext-free name that wouldn't
make sense on the wg-k8s-infra-gcb dashboard. Neither base_options
nor different tab names are currently supported by the
prowjob-annotation-based testgrid configurator.
  • Loading branch information
spiffxp committed Jul 15, 2021
1 parent 1faa348 commit 968873b
Show file tree
Hide file tree
Showing 42 changed files with 148 additions and 144 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cloud-provider-apiserver-network-proxy
testgrid-dashboards: sig-cloud-provider-apiserver-network-proxy, wg-k8s-infra-gcb
decorate: true
branches:
- ^master$
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/image-pushing/k8s-staging-apisnoop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ postsubmits:
- name: apisnoop-push-auditlogger-images
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: conformance-apisnoop
testgrid-dashboards: conformance-apisnoop, wg-k8s-infra-gcb
testgrid-tab-name: apisnoop-auditlogger-image
testgrid-alert-email: [email protected]
description: Builds the auditlogger image for APISnoop deployments
Expand All @@ -25,7 +25,7 @@ postsubmits:
- name: apisnoop-push-snoopdb-images
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: conformance-apisnoop
testgrid-dashboards: conformance-apisnoop, wg-k8s-infra-gcb
testgrid-tab-name: apisnoop-snoopdb-image
testgrid-alert-email: [email protected]
description: Builds the snoopdb image for APISnoop deployments
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-boskos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ postsubmits:
- name: post-boskos-push-images
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: sig-testing-boskos
testgrid-dashboards: sig-testing-boskos, wg-k8s-infra-gcb
testgrid-tab-name: push-images
testgrid-alert-email: [email protected]
decorate: true
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/image-pushing/k8s-staging-cloud-provider-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ postsubmits:
- name: cloud-provider-aws-push-images
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: provider-aws-cloud-provider-aws
testgrid-dashboards: provider-aws-cloud-provider-aws, wg-k8s-infra-gcb
testgrid-tab-name: cloud-provider-aws-image-pushes
decorate: true
branches:
Expand Down Expand Up @@ -35,7 +35,7 @@ postsubmits:
- name: aws-ebs-csi-driver-push-images
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: provider-aws-cloud-provider-aws
testgrid-dashboards: provider-aws-cloud-provider-aws, wg-k8s-infra-gcb
testgrid-tab-name: aws-ebs-csi-driver-image-pushes
decorate: true
branches:
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/image-pushing/k8s-staging-cloud-provider-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ postsubmits:
- name: post-gcp-filestore-push-images
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: provider-gcp-filestore-csi-driver
testgrid-dashboards: provider-gcp-filestore-csi-driver, wg-k8s-infra-gcb
decorate: true
branches:
# For publishing canary images.
Expand Down Expand Up @@ -33,7 +33,7 @@ postsubmits:
- name: post-gcp-compute-persistent-disk-csi-driver-push-images
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver
testgrid-dashboards: provider-gcp-compute-persistent-disk-csi-driver, wg-k8s-infra-gcb
testgrid-tab-name: post-image-k8s-staging-cloud-provider-gcp
decorate: true
branches:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-cluster-addons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ postsubmits:
- name: cluster-addons-postsubmit-push-to-staging
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-addons
testgrid-dashboards: sig-cluster-lifecycle-cluster-addons, wg-k8s-infra-gcb
decorate: true
branches:
- ^master$
Expand Down
24 changes: 12 additions & 12 deletions config/jobs/image-pushing/k8s-staging-cluster-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
decorate: true
branches:
- ^master$
Expand All @@ -29,7 +29,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
decorate: true
branches:
- ^main
Expand All @@ -52,7 +52,7 @@ postsubmits:
- name: post-cluster-api-provider-azure-push-images
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, sig-cluster-lifecycle-cluster-api-provider-azure
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, sig-cluster-lifecycle-cluster-api-provider-azure, wg-k8s-infra-gcb
testgrid-alert-email: [email protected]
decorate: true
branches:
Expand All @@ -77,7 +77,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
testgrid-alert-email: [email protected]
decorate: true
branches:
Expand All @@ -102,7 +102,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
decorate: true
branches:
- ^main$
Expand All @@ -126,7 +126,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
decorate: true
branches:
- ^master$
Expand All @@ -149,7 +149,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
decorate: true
branches:
- ^main$
Expand All @@ -173,7 +173,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
decorate: true
branches:
- ^master$
Expand All @@ -197,7 +197,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
decorate: true
branches:
- ^master$
Expand Down Expand Up @@ -247,7 +247,7 @@ periodics:
value: master
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
testgrid-tab-name: cluster-api-push-images-nightly
testgrid-alert-email: [email protected]
- name: cluster-api-provider-openstack-push-images-nightly
Expand Down Expand Up @@ -279,7 +279,7 @@ periodics:
value: master
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
testgrid-tab-name: cluster-api-provider-openstack-push-images-nightly
testgrid-alert-email: [email protected]
- name: cluster-api-provider-aws-push-images-nightly
Expand Down Expand Up @@ -311,6 +311,6 @@ periodics:
value: main
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-cluster-lifecycle-image-pushes
testgrid-dashboards: sig-cluster-lifecycle-image-pushes, wg-k8s-infra-gcb
testgrid-tab-name: cluster-api-provider-aws-push-images-nightly
testgrid-alert-email: [email protected]
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-cri-tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ postsubmits:
- name: post-cri-tools-images
cluster: k8s-infra-prow-build-trusted
annotations:
testgrid-dashboards: sig-node-cri-tools
testgrid-dashboards: sig-node-cri-tools, wg-k8s-infra-gcb
decorate: true
run_if_changed: '^images\/'
branches:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ postsubmits:
annotations:
# This is the name of some testgrid dashboard to report to.
# If this is the first one for your sig, you may need to create one
testgrid-dashboards: sig-auth-secrets-store-csi-driver
testgrid-dashboards: sig-auth-secrets-store-csi-driver, wg-k8s-infra-gcb
decorate: true
# we only need to run if necessary (e.g.: the version was bumped)
run_if_changed: '^docker\/'
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-descheduler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# This is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-scheduling
testgrid-dashboards: sig-scheduling, wg-k8s-infra-gcb
decorate: true
branches:
- ^master$
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-dns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ postsubmits:
cluster: k8s-infra-prow-build-trusted
annotations:
# this is the name of some testgrid dashboard to report to.
testgrid-dashboards: sig-network-dns
testgrid-dashboards: sig-network-dns, wg-k8s-infra-gcb
decorate: true
# match on regex '^\d+\.\d+\.\d+$' to trigger job on new tags
branches:
Expand Down
Loading

0 comments on commit 968873b

Please sign in to comment.