diff --git a/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml b/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml index b626428a7b4..0616dd3caf5 100644 --- a/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml +++ b/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml @@ -263,7 +263,8 @@ postsubmits: name: integ-telemetry-istiodless-mc-k8s-tests_istio_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -578,7 +579,8 @@ postsubmits: name: integ-pilot-istiodless-multicluster-tests_istio_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -767,7 +769,8 @@ postsubmits: name: integ-security-istiodless-multicluster-tests_istio_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -1824,7 +1827,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -2196,7 +2200,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -2324,7 +2329,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: diff --git a/prow/cluster/jobs/istio/istio/istio.istio.release-1.11.gen.yaml b/prow/cluster/jobs/istio/istio/istio.istio.release-1.11.gen.yaml index f8c14c74629..2540123cd20 100644 --- a/prow/cluster/jobs/istio/istio/istio.istio.release-1.11.gen.yaml +++ b/prow/cluster/jobs/istio/istio/istio.istio.release-1.11.gen.yaml @@ -263,7 +263,8 @@ postsubmits: name: integ-telemetry-istiodless-mc-k8s-tests_istio_release-1.11_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -578,7 +579,8 @@ postsubmits: name: integ-pilot-istiodless-multicluster-tests_istio_release-1.11_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -767,7 +769,8 @@ postsubmits: name: integ-security-istiodless-multicluster-tests_istio_release-1.11_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -1824,7 +1827,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -2196,7 +2200,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -2324,7 +2329,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: diff --git a/prow/cluster/jobs/istio/istio/istio.istio.release-1.7.gen.yaml b/prow/cluster/jobs/istio/istio/istio.istio.release-1.7.gen.yaml index a1032cdaa10..ef9c612ec04 100644 --- a/prow/cluster/jobs/istio/istio/istio.istio.release-1.7.gen.yaml +++ b/prow/cluster/jobs/istio/istio/istio.istio.release-1.7.gen.yaml @@ -422,7 +422,8 @@ postsubmits: name: integ-pilot-multicluster-tests_istio_release-1.7_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -781,7 +782,8 @@ postsubmits: name: install-cni-test_istio_release-1.7_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -1453,7 +1455,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -1515,7 +1518,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: diff --git a/prow/cluster/jobs/istio/istio/istio.istio.release-1.8.gen.yaml b/prow/cluster/jobs/istio/istio/istio.istio.release-1.8.gen.yaml index 23803f32242..956d70d759d 100644 --- a/prow/cluster/jobs/istio/istio/istio.istio.release-1.8.gen.yaml +++ b/prow/cluster/jobs/istio/istio/istio.istio.release-1.8.gen.yaml @@ -450,7 +450,8 @@ postsubmits: name: integ-external-istiod-mc-tests_istio_release-1.8_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -1014,7 +1015,8 @@ postsubmits: name: integ-k8s-120_istio_release-1.8_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -1079,7 +1081,8 @@ postsubmits: name: install-cni-test_istio_release-1.8_postsubmit path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -1795,7 +1798,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: @@ -1980,7 +1984,8 @@ presubmits: optional: true path_alias: istio.io/istio reporter_config: - slack: {} + slack: + job_states_to_report: [] skip_report: true spec: containers: diff --git a/prow/config/generate.go b/prow/config/generate.go index bfe14b748f2..f4fe572ccee 100644 --- a/prow/config/generate.go +++ b/prow/config/generate.go @@ -543,6 +543,9 @@ func (cli *Client) WriteConfig(jobs config.JobConfig, fname string) { if err := os.MkdirAll(dir, os.ModePerm); err != nil { exit(err, "failed to create directory: "+dir) } + // Horrible hack to workaround https://github.com/kubernetes/test-infra/issues/22888 + bs = bytes.ReplaceAll(bs, []byte(` slack: {}`), []byte(` slack: + job_states_to_report: []`)) output := []byte(cli.GlobalConfig.AutogenHeader) output = append(output, bs...) err = ioutil.WriteFile(fname, output, 0644)