Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prep kubernetes/k8s.io for default branch rename #20675

Merged
merged 1 commit into from
Feb 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/jobs/image-pushing/k8s-staging-infra-tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ postsubmits:
decorate: true
run_if_changed: "^dns/octodns-docker/"
branches:
- ^main$
- ^master$
spec:
serviceAccountName: gcb-builder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ presubmits:
run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
max_concurrency: 10
branches:
- ^main$
- ^master$
spec:
containers:
Expand Down Expand Up @@ -51,6 +52,7 @@ presubmits:
run_if_changed: '^infra/gcp/backup_tools/'
max_concurrency: 1
branches:
- ^main$
- ^master$
spec:
serviceAccountName: k8s-infra-gcr-promoter-test
Expand Down
1 change: 1 addition & 0 deletions config/jobs/kubernetes/wg-k8s-infra/k8sio-presubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ presubmits:
path_alias: k8s.io/k8s.io
run_if_changed: "^groups/"
branches:
- ^main$
- ^master$
spec:
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ postsubmits:
# one).
max_concurrency: 1
branches:
- ^main$
- ^master$
spec:
serviceAccountName: k8s-infra-gcr-promoter
Expand Down Expand Up @@ -40,7 +41,7 @@ periodics:
# into /home/prow/go/src/github.com/kubernetes/k8s.io.
- org: kubernetes
repo: k8s.io
base_ref: master
base_ref: main
spec:
# The k8s-artifacts-prod name was chosen in
# https://github.com/kubernetes/k8s.io/pull/695.
Expand Down Expand Up @@ -68,7 +69,7 @@ periodics:
extra_refs:
- org: kubernetes
repo: k8s.io
base_ref: master
base_ref: main
spec:
serviceAccountName: k8s-infra-gcr-promoter-bak
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ periodics:
extra_refs:
- org: kubernetes
repo: k8s.io
base_ref: master
base_ref: main
spec:
serviceAccountName: gsuite-groups-manager
containers:
Expand All @@ -30,6 +30,9 @@ postsubmits:
decorate: true
max_concurrency: 1
run_if_changed: '^groups/groups.yaml'
branches:
- ^main$
- ^master$
annotations:
testgrid-create-test-group: 'true'
testgrid-dashboards: wg-k8s-infra-k8sio
Expand All @@ -51,6 +54,7 @@ postsubmits:
max_concurrency: 1
run_if_changed: "^dns/zone-configs/"
branches:
- ^main$
- ^master$
annotations:
testgrid-create-test-group: 'true'
Expand All @@ -72,6 +76,7 @@ postsubmits:
max_concurrency: 1
run_if_changed: "^infra/gcp/clusters/projects/k8s-infra-prow-build/prow-build/resources/"
branches:
- ^main$
- ^master$
annotations:
testgrid-create-test-group: 'true'
Expand All @@ -96,6 +101,7 @@ postsubmits:
max_concurrency: 1
run_if_changed: "^infra/gcp/clusters/projects/k8s-infra-prow-build-trusted/prow-build-trusted/resources/"
branches:
- ^main$
- ^master$
annotations:
testgrid-create-test-group: 'true'
Expand Down
1 change: 1 addition & 0 deletions config/prow/plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ milestone_applier:
kubernetes/test-infra:
master: v1.21
kubernetes/k8s.io:
main: v1.21
master: v1.21
kubernetes/kops:
master: v1.20
Expand Down