Skip to content

genjobs: only override annotations if o.Annotations is not empty #3191

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.

Sign up for GitHub

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

Merged
istio-testing merged 1 commit into from
Feb 18, 2021
Merged

genjobs: only override annotations if o.Annotations is not empty #3191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion prow/genjobs/cmd/genjobs/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,9 @@ func updateEnvs(o options, job *config.JobBase) {

// updateJobBase updates the jobs JobBase fields based on provided inputs to work with private repositories.
func updateJobBase(o options, job *config.JobBase, orgrepo string) {
job.Annotations = o.Annotations
if len(o.Annotations) != 0 {
job.Annotations = o.Annotations
}

if o.SSHClone && orgrepo != "" {
job.CloneURI = fmt.Sprintf("git@%s:%s.git", gitHost, orgrepo)
Expand Down
6 changes: 0 additions & 6 deletions prow/genjobs/testdata/branches-out/branches-out_in.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
postsubmits:
istio/istio:
- name: example_postsubmit
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
branches:
- ^master$
decorate: true
Expand All @@ -29,9 +26,6 @@ postsubmits:
presubmits:
istio/istio:
- name: example_presubmit
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
always_run: true
branches:
- ^master$
Expand Down
9 changes: 0 additions & 9 deletions prow/genjobs/testdata/env_denylist/env_denylist_in.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
postsubmits:
istio/istio:
- name: example_postsubmit
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
branches:
- ^master$
decorate: true
Expand Down Expand Up @@ -34,9 +31,6 @@ postsubmits:
presubmits:
istio/istio:
- name: example_presubmit
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
always_run: true
branches:
- ^master$
Expand Down Expand Up @@ -68,9 +62,6 @@ presubmits:
periodics:
- name: example_periodic
cron: 0 2 * * *
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
decorate: true
extra_refs:
- base_ref: master
Expand Down
6 changes: 0 additions & 6 deletions prow/genjobs/testdata/simple_transform/simple_transform_in.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
postsubmits:
istio/istio:
- name: example_postsubmit
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
branches:
- ^master$
decorate: true
Expand All @@ -29,9 +26,6 @@ postsubmits:
presubmits:
istio/istio:
- name: example_presubmit
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
always_run: true
branches:
- ^master$
Expand Down
9 changes: 0 additions & 9 deletions prow/genjobs/testdata/volume_denylist/volume_denylist_in.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
postsubmits:
istio/istio:
- name: example_postsubmit
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
branches:
- ^master$
decorate: true
Expand Down Expand Up @@ -39,9 +36,6 @@ postsubmits:
presubmits:
istio/istio:
- name: example_presubmit
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
always_run: true
branches:
- ^master$
Expand Down Expand Up @@ -78,9 +72,6 @@ presubmits:
periodics:
- name: example_periodic
cron: 0 2 * * *
annotations:
description: Information that isn't needed
testgrid-dashboards: public-dash
decorate: true
extra_refs:
- base_ref: master
Expand Down