Skip to content

Commit 7423798

Browse files
dcearadceara
authored
Update notification for Core OVN triggered jobs to include repo/pull information. (openshift#73788)
That's especially useful for "triggered" notifications. That's because those jobs aren't necessarily running yet, so they might not have an associated Status.URL yet. Signed-off-by: Dumitru Ceara <[email protected]>
1 parent dceb512 commit 7423798

10 files changed

+148
-183
lines changed

‎ci-operator/config/openshift/ovn-kubernetes/.config.prowgen‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ slack_reporter:
55
- failure
66
- error
77
- triggered
8-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :white_check_mark:
9-
{{else if eq .Status.State "triggered"}} :in-progress: Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
10-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :warning: {{end}}'
8+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}* for PRs *{{.Spec.Pulls}}
9+
{{if eq .Status.State "success"}} ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :white_check_mark:
10+
{{else if eq .Status.State "triggered"}} was triggered. :in-progress:
11+
{{else}} ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :warning: {{end}}'
1112
job_names:
1213
- ovncore-perfscale-aws-ovn-large-node-density-cni
1314
- ovncore-perfscale-aws-ovn-large-cluster-density-v2

‎ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3675,11 +3675,10 @@ presubmits:
36753675
- failure
36763676
- error
36773677
- triggered
3678-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3679-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3680-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3681-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3682-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3678+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3679+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3680+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3681+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
36833682
<{{.Status.URL}}|View logs> :warning: {{end}}'
36843683
rerun_command: /test ovncore-perfscale-aws-ovn-large-cluster-density-v2
36853684
spec:
@@ -3764,11 +3763,10 @@ presubmits:
37643763
- failure
37653764
- error
37663765
- triggered
3767-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3768-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3769-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3770-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3771-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3766+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3767+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3768+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3769+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
37723770
<{{.Status.URL}}|View logs> :warning: {{end}}'
37733771
rerun_command: /test ovncore-perfscale-aws-ovn-large-node-density-cni
37743772
spec:
@@ -3853,11 +3851,10 @@ presubmits:
38533851
- failure
38543852
- error
38553853
- triggered
3856-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3857-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3858-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3859-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3860-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3854+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3855+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3856+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3857+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
38613858
<{{.Status.URL}}|View logs> :warning: {{end}}'
38623859
rerun_command: /test ovncore-perfscale-aws-ovn-xlarge-cluster-density-v2
38633860
spec:
@@ -3942,11 +3939,10 @@ presubmits:
39423939
- failure
39433940
- error
39443941
- triggered
3945-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3946-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3947-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3948-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3949-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3942+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3943+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3944+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3945+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
39503946
<{{.Status.URL}}|View logs> :warning: {{end}}'
39513947
rerun_command: /test ovncore-perfscale-aws-ovn-xlarge-node-density-cni
39523948
spec:

‎ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.16-presubmits.yaml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2598,11 +2598,10 @@ presubmits:
25982598
- failure
25992599
- error
26002600
- triggered
2601-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
2602-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
2603-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
2604-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
2605-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
2601+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
2602+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
2603+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
2604+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
26062605
<{{.Status.URL}}|View logs> :warning: {{end}}'
26072606
rerun_command: /test ovncore-perfscale-aws-ovn-large-cluster-density-v2
26082607
spec:
@@ -2687,11 +2686,10 @@ presubmits:
26872686
- failure
26882687
- error
26892688
- triggered
2690-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
2691-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
2692-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
2693-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
2694-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
2689+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
2690+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
2691+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
2692+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
26952693
<{{.Status.URL}}|View logs> :warning: {{end}}'
26962694
rerun_command: /test ovncore-perfscale-aws-ovn-large-node-density-cni
26972695
spec:
@@ -2776,11 +2774,10 @@ presubmits:
27762774
- failure
27772775
- error
27782776
- triggered
2779-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
2780-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
2781-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
2782-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
2783-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
2777+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
2778+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
2779+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
2780+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
27842781
<{{.Status.URL}}|View logs> :warning: {{end}}'
27852782
rerun_command: /test ovncore-perfscale-aws-ovn-xlarge-cluster-density-v2
27862783
spec:
@@ -2865,11 +2862,10 @@ presubmits:
28652862
- failure
28662863
- error
28672864
- triggered
2868-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
2869-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
2870-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
2871-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
2872-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
2865+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
2866+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
2867+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
2868+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
28732869
<{{.Status.URL}}|View logs> :warning: {{end}}'
28742870
rerun_command: /test ovncore-perfscale-aws-ovn-xlarge-node-density-cni
28752871
spec:

‎ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.17-presubmits.yaml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3200,11 +3200,10 @@ presubmits:
32003200
- failure
32013201
- error
32023202
- triggered
3203-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3204-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3205-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3206-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3207-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3203+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3204+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3205+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3206+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
32083207
<{{.Status.URL}}|View logs> :warning: {{end}}'
32093208
rerun_command: /test ovncore-perfscale-aws-ovn-large-cluster-density-v2
32103209
spec:
@@ -3289,11 +3288,10 @@ presubmits:
32893288
- failure
32903289
- error
32913290
- triggered
3292-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3293-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3294-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3295-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3296-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3291+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3292+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3293+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3294+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
32973295
<{{.Status.URL}}|View logs> :warning: {{end}}'
32983296
rerun_command: /test ovncore-perfscale-aws-ovn-large-node-density-cni
32993297
spec:
@@ -3378,11 +3376,10 @@ presubmits:
33783376
- failure
33793377
- error
33803378
- triggered
3381-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3382-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3383-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3384-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3385-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3379+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3380+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3381+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3382+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
33863383
<{{.Status.URL}}|View logs> :warning: {{end}}'
33873384
rerun_command: /test ovncore-perfscale-aws-ovn-xlarge-cluster-density-v2
33883385
spec:
@@ -3467,11 +3464,10 @@ presubmits:
34673464
- failure
34683465
- error
34693466
- triggered
3470-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3471-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3472-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3473-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3474-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3467+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3468+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3469+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3470+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
34753471
<{{.Status.URL}}|View logs> :warning: {{end}}'
34763472
rerun_command: /test ovncore-perfscale-aws-ovn-xlarge-node-density-cni
34773473
spec:

‎ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.18-presubmits.yaml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3525,11 +3525,10 @@ presubmits:
35253525
- failure
35263526
- error
35273527
- triggered
3528-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3529-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3530-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3531-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3532-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3528+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3529+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3530+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3531+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
35333532
<{{.Status.URL}}|View logs> :warning: {{end}}'
35343533
rerun_command: /test ovncore-perfscale-aws-ovn-large-cluster-density-v2
35353534
spec:
@@ -3614,11 +3613,10 @@ presubmits:
36143613
- failure
36153614
- error
36163615
- triggered
3617-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3618-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3619-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3620-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3621-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3616+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3617+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3618+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3619+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
36223620
<{{.Status.URL}}|View logs> :warning: {{end}}'
36233621
rerun_command: /test ovncore-perfscale-aws-ovn-large-node-density-cni
36243622
spec:
@@ -3703,11 +3701,10 @@ presubmits:
37033701
- failure
37043702
- error
37053703
- triggered
3706-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3707-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3708-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3709-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3710-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3704+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3705+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3706+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3707+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
37113708
<{{.Status.URL}}|View logs> :warning: {{end}}'
37123709
rerun_command: /test ovncore-perfscale-aws-ovn-xlarge-cluster-density-v2
37133710
spec:
@@ -3792,11 +3789,10 @@ presubmits:
37923789
- failure
37933790
- error
37943791
- triggered
3795-
report_template: '{{if eq .Status.State "success"}} :white_check_mark: Job
3796-
*{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
3797-
:white_check_mark: {{else if eq .Status.State "triggered"}} :in-progress:
3798-
Job *{{.Spec.Job}}* triggered. <{{.Status.URL}}|View logs> :in-progress:
3799-
{{else}} :warning: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
3792+
report_template: 'Job *{{.Spec.Job}}* in Repo *{{.Spec.Org}}/{{.Spec.Repo}}*
3793+
for PRs *{{.Spec.Pulls}} {{if eq .Status.State "success"}} ended with *{{.Status.State}}*.
3794+
<{{.Status.URL}}|View logs> :white_check_mark: {{else if eq .Status.State
3795+
"triggered"}} was triggered. :in-progress: {{else}} ended with *{{.Status.State}}*.
38003796
<{{.Status.URL}}|View logs> :warning: {{end}}'
38013797
rerun_command: /test ovncore-perfscale-aws-ovn-xlarge-node-density-cni
38023798
spec:

0 commit comments

Comments
 (0)