From d10c6ae5bd4cfaa3937d14ab823515b57d1b0502 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 16 Dec 2024 00:03:49 +0000 Subject: [PATCH 1/6] registry-replacer --github-token-path /etc/github/oauth --github-endpoint http://ghproxy --config-dir ./ci-operator/config --registry ./ci-operator/step-registry --prune-unused-replacements --prune-ocp-builder-replacements --prune-unused-base-images --current-release-minor=19 --ensure-correct-promotion-dockerfile-ignored-repos openshift/origin-aggregated-logging --ensure-correct-promotion-dockerfile-ignored-repos openshift/console --ensure-correct-promotion-dockerfile-ignored-repos openshift/linuxptp-daemon --- ...priv-cluster-api-provider-ovirt-master.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.10.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.11.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.12.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.13.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.14.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.15.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.16.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.17.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.18.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.19.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.20.yaml | 8 -------- ...cluster-api-provider-ovirt-release-4.8.yaml | 4 ---- ...cluster-api-provider-ovirt-release-4.9.yaml | 4 ---- ...shift-priv-cluster-nfd-operator-master.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.10.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.11.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.12.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.13.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.14.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.15.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.16.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.17.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.18.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.19.yaml | 4 ---- ...priv-cluster-nfd-operator-release-4.20.yaml | 4 ---- ...-priv-cluster-nfd-operator-release-4.9.yaml | 4 ---- ...enshift-priv-cluster-olm-operator-main.yaml | 18 +++++++++--------- ...priv-cluster-olm-operator-release-4.19.yaml | 18 +++++++++--------- ...priv-cluster-olm-operator-release-4.20.yaml | 18 +++++++++--------- ...ift-priv-insights-operator-release-4.7.yaml | 4 ---- ...luster-api-provider-ovirt-release-4.19.yaml | 8 -------- ...luster-api-provider-ovirt-release-4.20.yaml | 8 -------- .../openshift-cluster-olm-operator-main.yaml | 14 +++++++------- ...ft-cluster-olm-operator-main__okd-scos.yaml | 2 +- ...hift-cluster-olm-operator-release-4.19.yaml | 14 +++++++------- ...hift-cluster-olm-operator-release-4.20.yaml | 16 ++++++++-------- 37 files changed, 50 insertions(+), 226 deletions(-) diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml index 1e198742dbdb..f2dbe03710f4 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest ocp_4.16_base-rhel9: name: 4.19-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml index 290aaab8191a..210a9e7edf8e 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.10-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.17-openshift-4.10 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml index 0ec7ae533d66..0f0ffda411fb 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.11-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.11 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml index 0390bc7028d1..d704477fdfac 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.12-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.19-openshift-4.12 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml index 64226bde06f0..025ae06d4349 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.13-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.19-openshift-4.13 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml index cfe46d17ceb0..ca5c5b27cf9f 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.14-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.20-openshift-4.14 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml index 18a391765909..ff9fd964b7d6 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest ocp_4.14_base: name: 4.14-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.20-openshift-4.14 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml index c7bb1cd4f697..e55e3e9b51f3 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest ocp_4.16_base-rhel9: name: 4.16-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml index 12d656fd8466..cc4a4fbc832e 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest ocp_4.16_base-rhel9: name: 4.17-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.18.yaml index f4fdd69a7012..2527d547d860 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.18.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest ocp_4.16_base-rhel9: name: 4.18-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.19.yaml index 728e43135956..f27554ee361e 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.19.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest ocp_4.16_base-rhel9: name: 4.19-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.20.yaml index 1be00ecde8f8..495e21e7afb2 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.20.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest ocp_4.16_base-rhel9: name: 4.20-priv namespace: ocp-private @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml index 5962c0fb235f..134e14bbc6e2 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.8-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml index 711968949777..0579ca8abae8 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest base: name: 4.9-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml index c7f72a64c05e..295d4d66a1c1 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml @@ -1,8 +1,4 @@ base_images: - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_4.18_base-rhel9: name: 4.19-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml index d0cee1215afd..6d04309cf5be 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml @@ -3,10 +3,6 @@ base_images: name: 4.10-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml index b2c1355a584c..13b7086beb03 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml @@ -3,10 +3,6 @@ base_images: name: 4.11-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml index 57b2210112ba..0a9329576e3d 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml @@ -3,10 +3,6 @@ base_images: name: 4.12-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.19-openshift-4.12: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml index d22256399f68..badd8f918626 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml @@ -3,10 +3,6 @@ base_images: name: 4.13-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.19-openshift-4.13: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml index 3a6a70cec0a0..0b2012dd336e 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml @@ -3,10 +3,6 @@ base_images: name: 4.14-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.20-openshift-4.14: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml index 79a15f63c11d..b571764d4475 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml @@ -1,8 +1,4 @@ base_images: - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_4.15_base-rhel9: name: 4.15-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml index 29964a20cb29..6ada09403c30 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml @@ -1,8 +1,4 @@ base_images: - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_4.16_base-rhel9: name: 4.16-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml index e3364d4933c6..bfed2c82ab50 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml @@ -1,8 +1,4 @@ base_images: - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_4.17_base-rhel9: name: 4.17-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.18.yaml index 4f7715f93340..6f6d2f7198e7 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.18.yaml @@ -1,8 +1,4 @@ base_images: - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_4.18_base-rhel9: name: 4.18-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.19.yaml index 3793aa8dcf3e..5f4a25fbc6e2 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.19.yaml @@ -1,8 +1,4 @@ base_images: - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_4.18_base-rhel9: name: 4.19-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.20.yaml index 75f13dc295d3..c15c3dc75a94 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.20.yaml @@ -1,8 +1,4 @@ base_images: - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_4.18_base-rhel9: name: 4.20-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml index ef2e666b29cb..b91b3cf5321b 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml @@ -3,10 +3,6 @@ base_images: name: 4.9-priv namespace: ocp-private tag: base - ci-artifacts: - name: master - namespace: psap - tag: ci-artifacts ocp_builder_rhel-8-golang-1.16-openshift-4.9: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml index 5b62a09f8536..6af2979b9ac8 100644 --- a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml +++ b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml @@ -1,12 +1,12 @@ base_images: - ocp_4.18_base-rhel9: - name: 4.19-priv - namespace: ocp-private + ocp_4.19_base-rhel9: + name: "4.19" + namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + ocp_builder_rhel-9-golang-1.23-openshift-4.19: name: builder namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 + tag: rhel-9-golang-1.23-openshift-4.19 binary_build_commands: make build build_root: from_repository: true @@ -14,12 +14,12 @@ canonical_go_repository: github.com/openshift/cluster-olm-operator images: - dockerfile_path: Dockerfile inputs: - ocp_4.18_base-rhel9: + ocp_4.19_base-rhel9: as: - - registry.ci.openshift.org/ocp/4.18:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + - registry.ci.openshift.org/ocp/4.19:base-rhel9 + ocp_builder_rhel-9-golang-1.23-openshift-4.19: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: cluster-olm-operator promotion: to: diff --git a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml index 3a6619fb048c..62435a403af6 100644 --- a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml @@ -1,12 +1,12 @@ base_images: - ocp_4.18_base-rhel9: - name: 4.19-priv - namespace: ocp-private + ocp_4.19_base-rhel9: + name: "4.19" + namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + ocp_builder_rhel-9-golang-1.23-openshift-4.19: name: builder namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 + tag: rhel-9-golang-1.23-openshift-4.19 binary_build_commands: make build build_root: from_repository: true @@ -14,12 +14,12 @@ canonical_go_repository: github.com/openshift/cluster-olm-operator images: - dockerfile_path: Dockerfile inputs: - ocp_4.18_base-rhel9: + ocp_4.19_base-rhel9: as: - - registry.ci.openshift.org/ocp/4.18:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + - registry.ci.openshift.org/ocp/4.19:base-rhel9 + ocp_builder_rhel-9-golang-1.23-openshift-4.19: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: cluster-olm-operator promotion: to: diff --git a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml index e13454c7a8e5..a92ff35c7bdf 100644 --- a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml @@ -1,12 +1,12 @@ base_images: - ocp_4.18_base-rhel9: - name: 4.20-priv - namespace: ocp-private + ocp_4.19_base-rhel9: + name: "4.19" + namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + ocp_builder_rhel-9-golang-1.23-openshift-4.19: name: builder namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 + tag: rhel-9-golang-1.23-openshift-4.19 binary_build_commands: make build build_root: from_repository: true @@ -14,12 +14,12 @@ canonical_go_repository: github.com/openshift/cluster-olm-operator images: - dockerfile_path: Dockerfile inputs: - ocp_4.18_base-rhel9: + ocp_4.19_base-rhel9: as: - - registry.ci.openshift.org/ocp/4.18:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + - registry.ci.openshift.org/ocp/4.19:base-rhel9 + ocp_builder_rhel-9-golang-1.23-openshift-4.19: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: cluster-olm-operator promotion: to: diff --git a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml index 3bc800cf3806..6b8490752fc1 100644 --- a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml +++ b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml @@ -3,10 +3,6 @@ base_images: name: 4.7-priv namespace: ocp-private tag: base - insights-operator-tests: - name: insights-operator-tests - namespace: ci - tag: latest ocp_builder_rhel-8-golang-1.15-openshift-4.7: name: builder namespace: ocp diff --git a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.19.yaml b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.19.yaml index cd5e179c096f..483f0be66a49 100644 --- a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.19.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.19.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest ocp_4.16_base-rhel9: name: "4.19" namespace: ocp @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.20.yaml b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.20.yaml index 00fc23df39f3..e80a9a6b0217 100644 --- a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.20.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.20.yaml @@ -1,8 +1,4 @@ base_images: - ansible-runner-ovirt: - name: ansible-runner-ovirt - namespace: openshift - tag: latest ocp_4.16_base-rhel9: name: "4.20" namespace: ocp @@ -11,10 +7,6 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 - ovirt-prfinder: - name: ovirt-prfinder - namespace: openshift - tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main.yaml b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main.yaml index dd40b7aba357..a018292925cd 100644 --- a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main.yaml @@ -1,24 +1,24 @@ base_images: - ocp_4.18_base-rhel9: + ocp_4.19_base-rhel9: name: "4.19" namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + ocp_builder_rhel-9-golang-1.23-openshift-4.19: name: builder namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 + tag: rhel-9-golang-1.23-openshift-4.19 binary_build_commands: make build build_root: from_repository: true images: - dockerfile_path: Dockerfile inputs: - ocp_4.18_base-rhel9: + ocp_4.19_base-rhel9: as: - - registry.ci.openshift.org/ocp/4.18:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + - registry.ci.openshift.org/ocp/4.19:base-rhel9 + ocp_builder_rhel-9-golang-1.23-openshift-4.19: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: cluster-olm-operator promotion: to: diff --git a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main__okd-scos.yaml b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main__okd-scos.yaml index f9fb8f864d11..4f9da629c07c 100644 --- a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main__okd-scos.yaml +++ b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main__okd-scos.yaml @@ -22,7 +22,7 @@ images: ocp_builder_rhel-9-golang-1.23-openshift-4.19: as: - builder - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: cluster-olm-operator promotion: to: diff --git a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.19.yaml b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.19.yaml index 34d5fb20ac40..07af5deea0d4 100644 --- a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.19.yaml +++ b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.19.yaml @@ -1,24 +1,24 @@ base_images: - ocp_4.18_base-rhel9: + ocp_4.19_base-rhel9: name: "4.19" namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + ocp_builder_rhel-9-golang-1.23-openshift-4.19: name: builder namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 + tag: rhel-9-golang-1.23-openshift-4.19 binary_build_commands: make build build_root: from_repository: true images: - dockerfile_path: Dockerfile inputs: - ocp_4.18_base-rhel9: + ocp_4.19_base-rhel9: as: - - registry.ci.openshift.org/ocp/4.18:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + - registry.ci.openshift.org/ocp/4.19:base-rhel9 + ocp_builder_rhel-9-golang-1.23-openshift-4.19: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: cluster-olm-operator promotion: to: diff --git a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml index ba04a1a3b516..13711f758712 100644 --- a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml +++ b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml @@ -1,24 +1,24 @@ base_images: - ocp_4.18_base-rhel9: - name: "4.20" + ocp_4.19_base-rhel9: + name: "4.19" namespace: ocp tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + ocp_builder_rhel-9-golang-1.23-openshift-4.19: name: builder namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 + tag: rhel-9-golang-1.23-openshift-4.19 binary_build_commands: make build build_root: from_repository: true images: - dockerfile_path: Dockerfile inputs: - ocp_4.18_base-rhel9: + ocp_4.19_base-rhel9: as: - - registry.ci.openshift.org/ocp/4.18:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: + - registry.ci.openshift.org/ocp/4.19:base-rhel9 + ocp_builder_rhel-9-golang-1.23-openshift-4.19: as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: cluster-olm-operator promotion: to: From eb7efbf4b54472729a463c8e28275023a0d691bd Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 16 Dec 2024 00:03:55 +0000 Subject: [PATCH 2/6] config-brancher --config-dir ./ci-operator/config --current-release 4.19 --skip-periodics --future-release 4.20 --confirm --- ...openshift-cluster-api-provider-ovirt-release-4.19.yaml | 8 ++++++++ ...openshift-cluster-api-provider-ovirt-release-4.20.yaml | 8 ++++++++ .../openshift-cluster-olm-operator-release-4.20.yaml | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.19.yaml b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.19.yaml index 483f0be66a49..cd5e179c096f 100644 --- a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.19.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.19.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: "4.19" namespace: ocp @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.20.yaml b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.20.yaml index e80a9a6b0217..00fc23df39f3 100644 --- a/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.20.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-release-4.20.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: "4.20" namespace: ocp @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml index 13711f758712..3b693e608949 100644 --- a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml +++ b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml @@ -1,6 +1,6 @@ base_images: ocp_4.19_base-rhel9: - name: "4.19" + name: "4.20" namespace: ocp tag: base-rhel9 ocp_builder_rhel-9-golang-1.23-openshift-4.19: From b4e3d0a4673605d1c7b78a7c0b2be7ea5831df0e Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 16 Dec 2024 00:04:02 +0000 Subject: [PATCH 3/6] ci-operator-config-mirror --config-dir ./ci-operator/config --to-org openshift-priv --only-org openshift --whitelist-file ./core-services/openshift-priv/_whitelist.yaml --- .../openshift-priv-cluster-api-provider-ovirt-master.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.10.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.11.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.12.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.13.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.14.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.15.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.16.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.17.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.18.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.19.yaml | 8 ++++++++ ...hift-priv-cluster-api-provider-ovirt-release-4.20.yaml | 8 ++++++++ ...shift-priv-cluster-api-provider-ovirt-release-4.8.yaml | 4 ++++ ...shift-priv-cluster-api-provider-ovirt-release-4.9.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-master.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.10.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.11.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.12.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.13.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.14.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.15.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.16.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.17.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.18.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.19.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.20.yaml | 4 ++++ .../openshift-priv-cluster-nfd-operator-release-4.9.yaml | 4 ++++ .../openshift-priv-cluster-olm-operator-main.yaml | 4 ++-- .../openshift-priv-cluster-olm-operator-release-4.19.yaml | 4 ++-- .../openshift-priv-cluster-olm-operator-release-4.20.yaml | 4 ++-- ... => openshift-priv-cluster-version-operator-main.yaml} | 2 +- .../openshift-priv-insights-operator-release-4.7.yaml | 4 ++++ ... openshift-priv-multus-admission-controller-main.yaml} | 2 +- 33 files changed, 168 insertions(+), 8 deletions(-) rename ci-operator/config/openshift-priv/cluster-version-operator/{openshift-priv-cluster-version-operator-master.yaml => openshift-priv-cluster-version-operator-main.yaml} (99%) rename ci-operator/config/openshift-priv/multus-admission-controller/{openshift-priv-multus-admission-controller-master.yaml => openshift-priv-multus-admission-controller-main.yaml} (98%) diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml index f2dbe03710f4..1e198742dbdb 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-master.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: 4.19-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml index 210a9e7edf8e..290aaab8191a 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.10-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.17-openshift-4.10 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml index 0f0ffda411fb..0ec7ae533d66 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.11.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.11-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.18-openshift-4.11 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml index d704477fdfac..0390bc7028d1 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.12.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.12-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.19-openshift-4.12 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml index 025ae06d4349..64226bde06f0 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.13.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.13-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.19-openshift-4.13 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml index ca5c5b27cf9f..cfe46d17ceb0 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.14.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.14-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.20-openshift-4.14 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml index ff9fd964b7d6..18a391765909 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.15.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.14_base: name: 4.14-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.20-openshift-4.14 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml index e55e3e9b51f3..c7bb1cd4f697 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.16.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: 4.16-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml index cc4a4fbc832e..12d656fd8466 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.17.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: 4.17-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.18.yaml index 2527d547d860..f4fdd69a7012 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.18.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: 4.18-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.19.yaml index f27554ee361e..728e43135956 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.19.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: 4.19-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.20.yaml index 495e21e7afb2..1be00ecde8f8 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.20.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest ocp_4.16_base-rhel9: name: 4.20-priv namespace: ocp-private @@ -7,6 +11,10 @@ base_images: name: builder namespace: ocp tag: rhel-9-golang-1.21-openshift-4.16 + ovirt-prfinder: + name: ovirt-prfinder + namespace: openshift + tag: latest binary_build_commands: make build build_root: from_repository: true diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml index 134e14bbc6e2..5962c0fb235f 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.8-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml index 0579ca8abae8..711968949777 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.9.yaml @@ -1,4 +1,8 @@ base_images: + ansible-runner-ovirt: + name: ansible-runner-ovirt + namespace: openshift + tag: latest base: name: 4.9-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml index 295d4d66a1c1..c7f72a64c05e 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-master.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.18_base-rhel9: name: 4.19-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml index 6d04309cf5be..d0cee1215afd 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml @@ -3,6 +3,10 @@ base_images: name: 4.10-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml index 13b7086beb03..b2c1355a584c 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.11.yaml @@ -3,6 +3,10 @@ base_images: name: 4.11-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.18-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml index 0a9329576e3d..57b2210112ba 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.12.yaml @@ -3,6 +3,10 @@ base_images: name: 4.12-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.19-openshift-4.12: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml index badd8f918626..d22256399f68 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.13.yaml @@ -3,6 +3,10 @@ base_images: name: 4.13-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.19-openshift-4.13: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml index 0b2012dd336e..3a6a70cec0a0 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.14.yaml @@ -3,6 +3,10 @@ base_images: name: 4.14-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.20-openshift-4.14: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml index b571764d4475..79a15f63c11d 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.15.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.15_base-rhel9: name: 4.15-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml index 6ada09403c30..29964a20cb29 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.16.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.16_base-rhel9: name: 4.16-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml index bfed2c82ab50..e3364d4933c6 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.17.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.17_base-rhel9: name: 4.17-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.18.yaml index 6f6d2f7198e7..4f7715f93340 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.18.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.18_base-rhel9: name: 4.18-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.19.yaml index 5f4a25fbc6e2..3793aa8dcf3e 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.19.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.18_base-rhel9: name: 4.19-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.20.yaml index c15c3dc75a94..75f13dc295d3 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.20.yaml @@ -1,4 +1,8 @@ base_images: + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_4.18_base-rhel9: name: 4.20-priv namespace: ocp-private diff --git a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml index b91b3cf5321b..ef2e666b29cb 100644 --- a/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml @@ -3,6 +3,10 @@ base_images: name: 4.9-priv namespace: ocp-private tag: base + ci-artifacts: + name: master + namespace: psap + tag: ci-artifacts ocp_builder_rhel-8-golang-1.16-openshift-4.9: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml index 6af2979b9ac8..16ee2d4e7d13 100644 --- a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml +++ b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml @@ -1,7 +1,7 @@ base_images: ocp_4.19_base-rhel9: - name: "4.19" - namespace: ocp + name: 4.19-priv + namespace: ocp-private tag: base-rhel9 ocp_builder_rhel-9-golang-1.23-openshift-4.19: name: builder diff --git a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml index 62435a403af6..1493fdbd27fc 100644 --- a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml @@ -1,7 +1,7 @@ base_images: ocp_4.19_base-rhel9: - name: "4.19" - namespace: ocp + name: 4.19-priv + namespace: ocp-private tag: base-rhel9 ocp_builder_rhel-9-golang-1.23-openshift-4.19: name: builder diff --git a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml index a92ff35c7bdf..16875548c7ea 100644 --- a/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml @@ -1,7 +1,7 @@ base_images: ocp_4.19_base-rhel9: - name: "4.19" - namespace: ocp + name: 4.20-priv + namespace: ocp-private tag: base-rhel9 ocp_builder_rhel-9-golang-1.23-openshift-4.19: name: builder diff --git a/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main.yaml similarity index 99% rename from ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master.yaml rename to ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main.yaml index 0fbc7c7b4de9..6fcdb3c755a2 100644 --- a/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main.yaml @@ -152,6 +152,6 @@ tests: FEATURE_SET: TechPreviewNoUpgrade workflow: openshift-upgrade-azure zz_generated_metadata: - branch: master + branch: main org: openshift-priv repo: cluster-version-operator diff --git a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml index 6b8490752fc1..3bc800cf3806 100644 --- a/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml +++ b/ci-operator/config/openshift-priv/insights-operator/openshift-priv-insights-operator-release-4.7.yaml @@ -3,6 +3,10 @@ base_images: name: 4.7-priv namespace: ocp-private tag: base + insights-operator-tests: + name: insights-operator-tests + namespace: ci + tag: latest ocp_builder_rhel-8-golang-1.15-openshift-4.7: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-master.yaml b/ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main.yaml similarity index 98% rename from ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-master.yaml rename to ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main.yaml index 631d4042a614..314ef89b87a0 100644 --- a/ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-master.yaml +++ b/ci-operator/config/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main.yaml @@ -52,6 +52,6 @@ tests: PROJECT_NAME: multus-admission-controller workflow: openshift-ci-security zz_generated_metadata: - branch: master + branch: main org: openshift-priv repo: multus-admission-controller From 671b58665b682a7b598c4defa36b0033d2c64274 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 16 Dec 2024 00:04:40 +0000 Subject: [PATCH 4/6] ci-operator-prowgen --from-dir ./ci-operator/config --to-dir ./ci-operator/jobs --- ...er-version-operator-main-postsubmits.yaml} | 5 +- ...ter-version-operator-main-presubmits.yaml} | 98 ++++++++----------- ...dmission-controller-main-postsubmits.yaml} | 5 +- ...admission-controller-main-presubmits.yaml} | 21 ++-- 4 files changed, 55 insertions(+), 74 deletions(-) rename ci-operator/jobs/openshift-priv/cluster-version-operator/{openshift-priv-cluster-version-operator-master-postsubmits.yaml => openshift-priv-cluster-version-operator-main-postsubmits.yaml} (95%) rename ci-operator/jobs/openshift-priv/cluster-version-operator/{openshift-priv-cluster-version-operator-master-presubmits.yaml => openshift-priv-cluster-version-operator-main-presubmits.yaml} (94%) rename ci-operator/jobs/openshift-priv/multus-admission-controller/{openshift-priv-multus-admission-controller-master-postsubmits.yaml => openshift-priv-multus-admission-controller-main-postsubmits.yaml} (97%) rename ci-operator/jobs/openshift-priv/multus-admission-controller/{openshift-priv-multus-admission-controller-master-presubmits.yaml => openshift-priv-multus-admission-controller-main-presubmits.yaml} (94%) diff --git a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-postsubmits.yaml similarity index 95% rename from ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-postsubmits.yaml rename to ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-postsubmits.yaml index ca40a9a4d122..6b84592a3c62 100644 --- a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-postsubmits.yaml @@ -3,8 +3,7 @@ postsubmits: - agent: kubernetes always_run: true branches: - - ^master$ - cluster: build10 + - ^main$ decorate: true decoration_config: oauth_token_secret: @@ -15,7 +14,7 @@ postsubmits: ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-priv-cluster-version-operator-master-images + name: branch-ci-openshift-priv-cluster-version-operator-main-images path_alias: github.com/openshift/cluster-version-operator spec: containers: diff --git a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-presubmits.yaml similarity index 94% rename from ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-presubmits.yaml rename to ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-presubmits.yaml index cbc0688945f6..b8b3d8ece2ba 100644 --- a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-presubmits.yaml @@ -3,9 +3,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/e2e-agnostic-operator decorate: true decoration_config: @@ -18,7 +17,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-operator + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-agnostic-operator path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-agnostic-operator skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -86,9 +85,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/e2e-agnostic-operator-techpreview decorate: true decoration_config: @@ -101,7 +99,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-operator-techpreview + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-agnostic-operator-techpreview path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-agnostic-operator-techpreview spec: @@ -168,9 +166,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/e2e-agnostic-ovn decorate: true decoration_config: @@ -183,7 +180,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-ovn + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-agnostic-ovn path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-agnostic-ovn skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -251,9 +248,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/e2e-agnostic-ovn-upgrade-into-change decorate: true decoration_config: @@ -266,7 +262,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-ovn-upgrade-into-change + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-agnostic-ovn-upgrade-into-change path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-agnostic-ovn-upgrade-into-change skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -334,9 +330,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/e2e-agnostic-ovn-upgrade-into-change-techpreview decorate: true decoration_config: @@ -349,7 +344,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-ovn-upgrade-into-change-techpreview + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-agnostic-ovn-upgrade-into-change-techpreview path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-agnostic-ovn-upgrade-into-change-techpreview spec: @@ -416,9 +411,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/e2e-agnostic-ovn-upgrade-out-of-change decorate: true decoration_config: @@ -431,7 +425,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-ovn-upgrade-out-of-change + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-agnostic-ovn-upgrade-out-of-change path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-agnostic-ovn-upgrade-out-of-change skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -499,9 +493,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/e2e-agnostic-ovn-upgrade-out-of-change-techpreview decorate: true decoration_config: @@ -514,7 +507,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-agnostic-ovn-upgrade-out-of-change-techpreview + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-agnostic-ovn-upgrade-out-of-change-techpreview path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-agnostic-ovn-upgrade-out-of-change-techpreview spec: @@ -581,9 +574,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build05 + - ^main$ + - ^main- context: ci/prow/e2e-aws-ovn-techpreview decorate: true decoration_config: @@ -596,7 +588,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-aws-ovn-techpreview + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-aws-ovn-techpreview path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-aws-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -664,9 +656,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/e2e-hypershift decorate: true decoration_config: @@ -679,7 +670,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: hypershift ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-hypershift + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-hypershift path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-hypershift skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -747,9 +738,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/e2e-hypershift-conformance decorate: true decoration_config: @@ -762,7 +752,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: hypershift ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-e2e-hypershift-conformance + name: pull-ci-openshift-priv-cluster-version-operator-main-e2e-hypershift-conformance path_alias: github.com/openshift/cluster-version-operator rerun_command: /test e2e-hypershift-conformance skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -830,9 +820,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/gofmt decorate: true decoration_config: @@ -843,7 +832,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-gofmt + name: pull-ci-openshift-priv-cluster-version-operator-main-gofmt path_alias: github.com/openshift/cluster-version-operator rerun_command: /test gofmt run_if_changed: \.go$ @@ -894,9 +883,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/images decorate: true decoration_config: @@ -907,7 +895,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-images + name: pull-ci-openshift-priv-cluster-version-operator-main-images path_alias: github.com/openshift/cluster-version-operator rerun_command: /test images spec: @@ -957,9 +945,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/lint decorate: true decoration_config: @@ -970,7 +957,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-lint + name: pull-ci-openshift-priv-cluster-version-operator-main-lint path_alias: github.com/openshift/cluster-version-operator rerun_command: /test lint spec: @@ -1020,9 +1007,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build09 + - ^main$ + - ^main- context: ci/prow/unit decorate: true decoration_config: @@ -1033,7 +1019,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-version-operator-master-unit + name: pull-ci-openshift-priv-cluster-version-operator-main-unit path_alias: github.com/openshift/cluster-version-operator rerun_command: /test unit skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ diff --git a/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-master-postsubmits.yaml b/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-postsubmits.yaml similarity index 97% rename from ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-master-postsubmits.yaml rename to ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-postsubmits.yaml index b718203f12f4..e1363122496b 100644 --- a/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-postsubmits.yaml @@ -3,8 +3,7 @@ postsubmits: - agent: kubernetes always_run: true branches: - - ^master$ - cluster: build01 + - ^main$ decorate: true decoration_config: oauth_token_secret: @@ -15,7 +14,7 @@ postsubmits: ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-priv-multus-admission-controller-master-images + name: branch-ci-openshift-priv-multus-admission-controller-main-images path_alias: github.com/openshift/multus-admission-controller spec: containers: diff --git a/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-presubmits.yaml similarity index 94% rename from ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-master-presubmits.yaml rename to ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-presubmits.yaml index 3cae12610ba5..f3b8165a0acd 100644 --- a/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-presubmits.yaml @@ -3,9 +3,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build01 + - ^main$ + - ^main- context: ci/prow/e2e-aws decorate: true decoration_config: @@ -18,7 +17,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-multus-admission-controller-master-e2e-aws + name: pull-ci-openshift-priv-multus-admission-controller-main-e2e-aws path_alias: github.com/openshift/multus-admission-controller rerun_command: /test e2e-aws spec: @@ -85,9 +84,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build10 + - ^main$ + - ^main- context: ci/prow/images decorate: true decoration_config: @@ -98,7 +96,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-multus-admission-controller-master-images + name: pull-ci-openshift-priv-multus-admission-controller-main-images path_alias: github.com/openshift/multus-admission-controller rerun_command: /test images spec: @@ -148,9 +146,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build10 + - ^main$ + - ^main- context: ci/prow/security decorate: true decoration_config: @@ -161,7 +158,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-multus-admission-controller-master-security + name: pull-ci-openshift-priv-multus-admission-controller-main-security optional: true path_alias: github.com/openshift/multus-admission-controller rerun_command: /test security From 7c607a311cd5a2ebf3724819ed28a5223105bc97 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 16 Dec 2024 00:05:54 +0000 Subject: [PATCH 5/6] sanitize-prow-jobs --prow-jobs-dir ./ci-operator/jobs --config-path ./core-services/sanitize-prow-jobs/_config.yaml --- ...-cluster-version-operator-main-postsubmits.yaml | 1 + ...v-cluster-version-operator-main-presubmits.yaml | 14 ++++++++++++++ ...ltus-admission-controller-main-postsubmits.yaml | 1 + ...ultus-admission-controller-main-presubmits.yaml | 3 +++ 4 files changed, 19 insertions(+) diff --git a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-postsubmits.yaml index 6b84592a3c62..7c759f57673d 100644 --- a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-postsubmits.yaml @@ -4,6 +4,7 @@ postsubmits: always_run: true branches: - ^main$ + cluster: build03 decorate: true decoration_config: oauth_token_secret: diff --git a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-presubmits.yaml index b8b3d8ece2ba..673085562dca 100644 --- a/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-main-presubmits.yaml @@ -5,6 +5,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/e2e-agnostic-operator decorate: true decoration_config: @@ -87,6 +88,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/e2e-agnostic-operator-techpreview decorate: true decoration_config: @@ -168,6 +170,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/e2e-agnostic-ovn decorate: true decoration_config: @@ -250,6 +253,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/e2e-agnostic-ovn-upgrade-into-change decorate: true decoration_config: @@ -332,6 +336,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/e2e-agnostic-ovn-upgrade-into-change-techpreview decorate: true decoration_config: @@ -413,6 +418,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/e2e-agnostic-ovn-upgrade-out-of-change decorate: true decoration_config: @@ -495,6 +501,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/e2e-agnostic-ovn-upgrade-out-of-change-techpreview decorate: true decoration_config: @@ -576,6 +583,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build01 context: ci/prow/e2e-aws-ovn-techpreview decorate: true decoration_config: @@ -658,6 +666,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/e2e-hypershift decorate: true decoration_config: @@ -740,6 +749,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/e2e-hypershift-conformance decorate: true decoration_config: @@ -822,6 +832,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/gofmt decorate: true decoration_config: @@ -885,6 +896,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/images decorate: true decoration_config: @@ -947,6 +959,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/lint decorate: true decoration_config: @@ -1009,6 +1022,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-postsubmits.yaml b/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-postsubmits.yaml index e1363122496b..6267deea036e 100644 --- a/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-postsubmits.yaml @@ -4,6 +4,7 @@ postsubmits: always_run: true branches: - ^main$ + cluster: build03 decorate: true decoration_config: oauth_token_secret: diff --git a/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-presubmits.yaml index f3b8165a0acd..cfd0f55405cb 100644 --- a/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/multus-admission-controller/openshift-priv-multus-admission-controller-main-presubmits.yaml @@ -5,6 +5,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build09 context: ci/prow/e2e-aws decorate: true decoration_config: @@ -86,6 +87,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/images decorate: true decoration_config: @@ -148,6 +150,7 @@ presubmits: branches: - ^main$ - ^main- + cluster: build03 context: ci/prow/security decorate: true decoration_config: From 5c9ce611c75bf6e7d326cbe68ad618c52e13bb48 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 16 Dec 2024 00:05:55 +0000 Subject: [PATCH 6/6] clusterimageset-updater --pools ./clusters/hosted-mgmt/hive/pools --imagesets ./clusters/hosted-mgmt/hive/pools --- ...e-4.17.9-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.9-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.9-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml index eda619b2a6c7..0796ccd8b51e 100644 --- a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.9-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml +++ b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.9-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml @@ -3,7 +3,6 @@ kind: ClusterImageSet metadata: annotations: version_lower: 4.17.0-0 - version_stream: 4-stable version_upper: 4.18.0-0 creationTimestamp: null name: ocp-release-4.17.9-x86-64-for-4.17.0-0-to-4.18.0-0