Skip to content

Commit d2a3d2c

Browse files
committed
Merge remote-tracking branch 'origin/main' into oape-ai-e2e/prow-workflow
2 parents 3e8ff56 + c08b579 commit d2a3d2c

31,408 files changed

Lines changed: 729292 additions & 302675 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coderabbit.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ inheritance: true
33
reviews:
44
high_level_summary: true
55
high_level_summary_instructions: |
6+
IMPORTANT: Always place the summary under a "## Summary by CodeRabbit" heading.
7+
Never blend the summary into the author's existing text. The summary must be
8+
clearly separated from any text the PR author wrote.
9+
610
This repository holds configuration for OpenShift CI infrastructure.
711
Key areas:
812
- CI configuration for component repositories

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ release-controllers: update_crt_crd
9494
./hack/generators/release-controllers/generate-release-controllers.py .
9595

9696
checkconfig:
97-
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_OPTS) $(CONTAINER_USER) --rm -v "$(CURDIR):/release$(VOLUME_MOUNT_FLAGS)" us-docker.pkg.dev/k8s-infra-prow/images/checkconfig:v20260504-92d6574a4 --config-path /release/core-services/prow/02_config/_config.yaml --supplemental-prow-config-dir=/release/core-services/prow/02_config --job-config-path /release/ci-operator/jobs/ --plugin-config /release/core-services/prow/02_config/_plugins.yaml --supplemental-plugin-config-dir /release/core-services/prow/02_config --strict --exclude-warning long-job-names --exclude-warning mismatched-tide-lenient
97+
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_OPTS) $(CONTAINER_USER) --rm -v "$(CURDIR):/release$(VOLUME_MOUNT_FLAGS)" us-docker.pkg.dev/k8s-infra-prow/images/checkconfig:v20260518-1704362c7 --config-path /release/core-services/prow/02_config/_config.yaml --supplemental-prow-config-dir=/release/core-services/prow/02_config --job-config-path /release/ci-operator/jobs/ --plugin-config /release/core-services/prow/02_config/_plugins.yaml --supplemental-plugin-config-dir /release/core-services/prow/02_config --strict --exclude-warning long-job-names --exclude-warning mismatched-tide-lenient
9898

9999
jobs: ci-operator-checkconfig
100100
$(MAKE) ci-operator-prowgen
@@ -409,7 +409,7 @@ update_github_ldap_mapping_config_map:
409409
.PHONY: update_github_ldap_mapping_config_map
410410

411411
download_dp_crd:
412-
curl -o clusters/build-clusters/common/testimagestreamtagimport.yaml https://raw.githubusercontent.com/openshift/ci-tools/main/pkg/api/testimagestreamtagimport/v1/ci.openshift.io_testimagestreamtagimports.yaml
412+
curl -o clusters/build-clusters/common/crd/testimagestreamtagimport.yaml https://raw.githubusercontent.com/openshift/ci-tools/main/pkg/api/testimagestreamtagimport/v1/ci.openshift.io_testimagestreamtagimports.yaml
413413
curl -o clusters/app.ci/prow/01_crd/pullrequestpayloadqualificationruns.yaml https://raw.githubusercontent.com/openshift/ci-tools/main/pkg/api/pullrequestpayloadqualification/v1/ci.openshift.io_pullrequestpayloadqualificationruns.yaml
414414
.PHONY: download_dp_crd
415415

@@ -425,7 +425,7 @@ sed_cmd := gsed
425425
timeout_cmd := gtimeout
426426
endif
427427

428-
crds = 'clusters/build-clusters/common/testimagestreamtagimport.yaml' 'clusters/app.ci/prow/01_crd/pullrequestpayloadqualificationruns.yaml' 'clusters/app.ci/release-controller/admin_01_releasepayload_crd.yaml'
428+
crds = 'clusters/build-clusters/common/crd/testimagestreamtagimport.yaml' 'clusters/app.ci/prow/01_crd/pullrequestpayloadqualificationruns.yaml' 'clusters/app.ci/release-controller/admin_01_releasepayload_crd.yaml'
429429

430430
$(crds):
431431
@#remove the empty lines at the beginning of the file. We do this to pass the yaml lint

OWNERS_ALIASES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ aliases:
535535
- tonyxrmdavidson
536536
ieng-chaos:
537537
- etirta
538+
- krisnababu
538539
perfscale-ocp-reviewers:
539540
- afcollins
540541
- akrzos

ci-operator/config/3scale-qe/3scale-deploy/.config.prowgen

Lines changed: 0 additions & 12 deletions
This file was deleted.

ci-operator/config/3scale-qe/3scale-deploy/3scale-qe-3scale-deploy-main__3scale-amp-ocp4.13-lp-interop.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ resources:
3333
tests:
3434
- as: 3scale-amp-interop-aws
3535
cron: 0 23 31 2 *
36+
reporter_config:
37+
channel: '#3scale-qe-notifications'
38+
job_states_to_report:
39+
- success
40+
- failure
41+
- error
42+
report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
43+
ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
44+
Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
45+
{{end}}'
3646
steps:
3747
cluster_profile: aws-cspi-qe
3848
env:

ci-operator/config/3scale-qe/3scale-deploy/3scale-qe-3scale-deploy-main__3scale-amp-ocp4.14-lp-interop.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ resources:
3333
tests:
3434
- as: 3scale-amp-interop-aws
3535
cron: 0 23 31 2 *
36+
reporter_config:
37+
channel: '#3scale-qe-notifications'
38+
job_states_to_report:
39+
- success
40+
- failure
41+
- error
42+
report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
43+
ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
44+
Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
45+
{{end}}'
3646
steps:
3747
cluster_profile: aws-cspi-qe
3848
env:

ci-operator/config/3scale-qe/3scale-deploy/3scale-qe-3scale-deploy-main__3scale-amp-ocp4.14-lp-rosa-classic.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ resources:
4141
tests:
4242
- as: 3scale-amp-interop-rosa-aws
4343
cron: 0 23 31 2 *
44+
reporter_config:
45+
channel: '#3scale-qe-notifications'
46+
job_states_to_report:
47+
- success
48+
- failure
49+
- error
50+
report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
51+
ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
52+
Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
53+
{{end}}'
4454
steps:
4555
cluster_profile: aws-cspi-qe
4656
env:

ci-operator/config/3scale-qe/3scale-deploy/3scale-qe-3scale-deploy-main__3scale-amp-ocp4.15-lp-interop.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ resources:
3333
tests:
3434
- as: 3scale-amp-interop-aws
3535
cron: 0 23 31 2 *
36+
reporter_config:
37+
channel: '#3scale-qe-notifications'
38+
job_states_to_report:
39+
- success
40+
- failure
41+
- error
42+
report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
43+
ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
44+
Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
45+
{{end}}'
3646
steps:
3747
cluster_profile: aws-cspi-qe
3848
env:

ci-operator/config/3scale-qe/3scale-deploy/3scale-qe-3scale-deploy-main__3scale-amp-ocp4.16-lp-interop.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ resources:
3333
tests:
3434
- as: 3scale-amp-interop-aws
3535
cron: 0 23 31 2 *
36+
reporter_config:
37+
channel: '#3scale-qe-notifications'
38+
job_states_to_report:
39+
- success
40+
- failure
41+
- error
42+
report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
43+
ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
44+
Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
45+
{{end}}'
3646
steps:
3747
cluster_profile: aws-cspi-qe
3848
env:

ci-operator/config/3scale-qe/3scale-deploy/3scale-qe-3scale-deploy-main__3scale-amp-ocp4.16-lp-rosa-classic.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ resources:
4141
tests:
4242
- as: 3scale-amp-interop-rosa-aws
4343
cron: 0 23 31 2 *
44+
reporter_config:
45+
channel: '#3scale-qe-notifications'
46+
job_states_to_report:
47+
- success
48+
- failure
49+
- error
50+
report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
51+
ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
52+
Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
53+
{{end}}'
4454
steps:
4555
cluster_profile: aws-cspi-qe
4656
env:

0 commit comments

Comments
 (0)