From cdbf008f3a15502d45ba25f066d678fefe10c010 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Wed, 8 Jun 2022 15:01:56 +0000 Subject: [PATCH 1/3] 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 --ensure-correct-promotion-dockerfile --current-release-minor=8 --ensure-correct-promotion-dockerfile-ignored-repos openshift/origin-aggregated-logging --ensure-correct-promotion-dockerfile-ignored-repos openshift/console --- .../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 -------- ...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.9.yaml | 4 ---- .../openshift-priv-insights-operator-release-4.7.yaml | 4 ---- .../openshift-priv/os/openshift-priv-os-release-4.11.yaml | 4 ---- .../openshift-priv/os/openshift-priv-os-release-4.12.yaml | 4 ---- .../config/openshift/os/openshift-os-release-4.11.yaml | 6 +++--- 15 files changed, 3 insertions(+), 75 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 de4e024851514..0595ec47e34a5 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 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.10.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml index 3f306348b5818..fa73e705f43de 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 82a235cc7be17..8ca740aa180d5 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 90282de61c9da..1fd0caf4d7ae1 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.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.8.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml index 885f55111a399..e8011b2bde324 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 82bc192900002..0cb9404c6ef0b 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 616003c8f970f..dfa20e9bc5804 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 @@ -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.10.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml index e1a9cf0126a28..666b44beaa745 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 bcffea63ee186..ced17213ed0c7 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 59a5186d2560f..7d5e23ff74035 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.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.9.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml index 691c14480ec4c..054dc5b3d60d0 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/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 1b7fdd761532f..3a14a0d935ad4 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-priv/os/openshift-priv-os-release-4.11.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml index fb0ea42e48e97..0abe8c01f3919 100644 --- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml @@ -3,10 +3,6 @@ base_images: name: coreos-assembler namespace: coreos tag: latest - fedora: - name: fedora - namespace: coreos - tag: "35" ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml index 9f282d20404f8..19db6f04e119d 100644 --- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml @@ -3,10 +3,6 @@ base_images: name: coreos-assembler namespace: coreos tag: latest - fedora: - name: fedora - namespace: coreos - tag: "35" ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml index 30062ff7148f0..d77372dff1dde 100644 --- a/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml +++ b/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml @@ -1,5 +1,5 @@ base_images: - coreos_coreos-assembler_4.11: + coreos_coreos-assembler_latest: name: coreos-assembler namespace: coreos tag: latest @@ -19,9 +19,9 @@ build_root: images: - dockerfile_path: ci/Dockerfile inputs: - coreos_coreos-assembler_4.11: + coreos_coreos-assembler_latest: as: - - registry.svc.ci.openshift.org/coreos/coreos-assembler:4.11 + - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest ocp_builder_rhel-8-golang-1.17-openshift-4.10: as: - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 From 113900b2f3a060105fa8443a609457bbc0410e68 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Wed, 8 Jun 2022 15:02:00 +0000 Subject: [PATCH 2/3] 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 ++++++++ ...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.9.yaml | 4 ++++ .../openshift-priv-insights-operator-release-4.7.yaml | 4 ++++ .../openshift-priv/os/openshift-priv-os-release-4.11.yaml | 4 ++++ .../openshift-priv/os/openshift-priv-os-release-4.12.yaml | 4 ++++ 14 files changed, 72 insertions(+) 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 0595ec47e34a5..de4e024851514 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 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.10.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.10.yaml index fa73e705f43de..3f306348b5818 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 8ca740aa180d5..82a235cc7be17 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 1fd0caf4d7ae1..90282de61c9da 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.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.8.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-ovirt/openshift-priv-cluster-api-provider-ovirt-release-4.8.yaml index e8011b2bde324..885f55111a399 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 0cb9404c6ef0b..82bc192900002 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 dfa20e9bc5804..616003c8f970f 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 @@ -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.10.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.10.yaml index 666b44beaa745..e1a9cf0126a28 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 ced17213ed0c7..bcffea63ee186 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 7d5e23ff74035..59a5186d2560f 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.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.9.yaml b/ci-operator/config/openshift-priv/cluster-nfd-operator/openshift-priv-cluster-nfd-operator-release-4.9.yaml index 054dc5b3d60d0..691c14480ec4c 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/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 3a14a0d935ad4..1b7fdd761532f 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/os/openshift-priv-os-release-4.11.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml index 0abe8c01f3919..fb0ea42e48e97 100644 --- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.11.yaml @@ -3,6 +3,10 @@ base_images: name: coreos-assembler namespace: coreos tag: latest + fedora: + name: fedora + namespace: coreos + tag: "35" ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp diff --git a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml index 19db6f04e119d..9f282d20404f8 100644 --- a/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/os/openshift-priv-os-release-4.12.yaml @@ -3,6 +3,10 @@ base_images: name: coreos-assembler namespace: coreos tag: latest + fedora: + name: fedora + namespace: coreos + tag: "35" ocp_builder_rhel-8-golang-1.17-openshift-4.10: name: builder namespace: ocp From 42bdfd98386786dac39ed56b06233d24255aa486 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Wed, 8 Jun 2022 15:03:05 +0000 Subject: [PATCH 3/3] clusterimageset-updater --pools ./clusters/hive/pools --imagesets ./clusters/hive/pools --- .../cvp/cvp-ocp-4-10-amd64-aws-eu-west-1_clusterpool.yaml | 2 +- .../cvp/cvp-ocp-4-8-amd64-aws-us-east-2_clusterpool.yaml | 2 +- .../hypershift-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml | 2 +- .../msp/msp-ocp-4-10-medium-single-az-aws_clusterpool.yaml | 2 +- .../msp/msp-ocp-4-10-small-single-az-aws_clusterpool.yaml | 2 +- ...-4-8-medium-single-az-amd64-aws-us-east-1_clusterpool.yaml | 2 +- ...p-4-8-small-single-az-amd64-aws-us-east-2_clusterpool.yaml | 2 +- ...0.18-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml} | 4 ++-- ...4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml} | 4 ++-- .../ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml | 2 +- .../ci-ocp-4-10-0-amd64-aws-us-west-1_clusterpool.yaml | 2 +- .../ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml | 2 +- .../ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml | 2 +- .../ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml | 2 +- .../ci-ocp-4-9-0-amd64-aws-us-east-1_clusterpool.yaml | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) rename clusters/hive/pools/{ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml => ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml} (77%) rename clusters/hive/pools/{ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml => ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml} (60%) diff --git a/clusters/hive/pools/cvp/cvp-ocp-4-10-amd64-aws-eu-west-1_clusterpool.yaml b/clusters/hive/pools/cvp/cvp-ocp-4-10-amd64-aws-eu-west-1_clusterpool.yaml index 9d49f94962980..1be0699f334bd 100644 --- a/clusters/hive/pools/cvp/cvp-ocp-4-10-amd64-aws-eu-west-1_clusterpool.yaml +++ b/clusters/hive/pools/cvp/cvp-ocp-4-10-amd64-aws-eu-west-1_clusterpool.yaml @@ -18,7 +18,7 @@ spec: hibernationConfig: resumeTimeout: 15m0s imageSetRef: - name: ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0 + name: ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-aws-eu-west-1 diff --git a/clusters/hive/pools/cvp/cvp-ocp-4-8-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hive/pools/cvp/cvp-ocp-4-8-amd64-aws-us-east-2_clusterpool.yaml index f2f0c4dbc2aab..dcb11a1dadc0e 100644 --- a/clusters/hive/pools/cvp/cvp-ocp-4-8-amd64-aws-us-east-2_clusterpool.yaml +++ b/clusters/hive/pools/cvp/cvp-ocp-4-8-amd64-aws-us-east-2_clusterpool.yaml @@ -18,7 +18,7 @@ spec: hibernationConfig: resumeTimeout: 15m0s imageSetRef: - name: ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0 + name: ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-aws-us-east-2 diff --git a/clusters/hive/pools/hypershift/hypershift-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/hypershift/hypershift-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml index a0546de845392..848e3ba8259ce 100644 --- a/clusters/hive/pools/hypershift/hypershift-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml +++ b/clusters/hive/pools/hypershift/hypershift-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml @@ -17,7 +17,7 @@ spec: baseDomain: hive.hypershift.devcluster.openshift.com hibernationConfig: null imageSetRef: - name: ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0 + name: ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0 installAttemptsLimit: 3 installConfigSecretTemplateRef: name: install-config-aws-us-east-1 diff --git a/clusters/hive/pools/msp/msp-ocp-4-10-medium-single-az-aws_clusterpool.yaml b/clusters/hive/pools/msp/msp-ocp-4-10-medium-single-az-aws_clusterpool.yaml index 42fdf8d8ff508..46aa832770112 100644 --- a/clusters/hive/pools/msp/msp-ocp-4-10-medium-single-az-aws_clusterpool.yaml +++ b/clusters/hive/pools/msp/msp-ocp-4-10-medium-single-az-aws_clusterpool.yaml @@ -20,7 +20,7 @@ spec: hibernationConfig: resumeTimeout: 15m0s imageSetRef: - name: ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0 + name: ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-medium-aws-us-east-1 diff --git a/clusters/hive/pools/msp/msp-ocp-4-10-small-single-az-aws_clusterpool.yaml b/clusters/hive/pools/msp/msp-ocp-4-10-small-single-az-aws_clusterpool.yaml index 6a2f977ffeb7c..ef1e4f32f2b35 100644 --- a/clusters/hive/pools/msp/msp-ocp-4-10-small-single-az-aws_clusterpool.yaml +++ b/clusters/hive/pools/msp/msp-ocp-4-10-small-single-az-aws_clusterpool.yaml @@ -20,7 +20,7 @@ spec: hibernationConfig: resumeTimeout: 15m0s imageSetRef: - name: ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0 + name: ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-small-aws-us-east-2 diff --git a/clusters/hive/pools/msp/msp-ocp-4-8-medium-single-az-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/msp/msp-ocp-4-8-medium-single-az-amd64-aws-us-east-1_clusterpool.yaml index 9db0ff28c99cf..f5127aef3c17f 100644 --- a/clusters/hive/pools/msp/msp-ocp-4-8-medium-single-az-amd64-aws-us-east-1_clusterpool.yaml +++ b/clusters/hive/pools/msp/msp-ocp-4-8-medium-single-az-amd64-aws-us-east-1_clusterpool.yaml @@ -20,7 +20,7 @@ spec: hibernationConfig: resumeTimeout: 15m0s imageSetRef: - name: ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0 + name: ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-medium-aws-us-east-1 diff --git a/clusters/hive/pools/msp/msp-ocp-4-8-small-single-az-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hive/pools/msp/msp-ocp-4-8-small-single-az-amd64-aws-us-east-2_clusterpool.yaml index ec81e990fa91c..13eee9877fd02 100644 --- a/clusters/hive/pools/msp/msp-ocp-4-8-small-single-az-amd64-aws-us-east-2_clusterpool.yaml +++ b/clusters/hive/pools/msp/msp-ocp-4-8-small-single-az-amd64-aws-us-east-2_clusterpool.yaml @@ -20,7 +20,7 @@ spec: hibernationConfig: resumeTimeout: 15m0s imageSetRef: - name: ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0 + name: ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-small-aws-us-east-2 diff --git a/clusters/hive/pools/ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml b/clusters/hive/pools/ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml similarity index 77% rename from clusters/hive/pools/ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml rename to clusters/hive/pools/ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml index 6d06b24f9663a..cf1e299c40e00 100644 --- a/clusters/hive/pools/ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml +++ b/clusters/hive/pools/ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0_clusterimageset.yaml @@ -5,7 +5,7 @@ metadata: version_lower: 4.10.0-0 version_upper: 4.11.0-0 creationTimestamp: null - name: ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0 + name: ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0 spec: - releaseImage: quay.io/openshift-release-dev/ocp-release:4.10.17-x86_64 + releaseImage: quay.io/openshift-release-dev/ocp-release:4.10.18-x86_64 status: {} diff --git a/clusters/hive/pools/ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml b/clusters/hive/pools/ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml similarity index 60% rename from clusters/hive/pools/ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml rename to clusters/hive/pools/ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml index 6edd465197525..44a2be9c591d1 100644 --- a/clusters/hive/pools/ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml +++ b/clusters/hive/pools/ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0_clusterimageset.yaml @@ -5,7 +5,7 @@ metadata: version_lower: 4.8.0-0 version_upper: 4.9.0-0 creationTimestamp: null - name: ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0 + name: ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0 spec: - releaseImage: quay.io/openshift-release-dev/ocp-release:4.8.42-x86_64 + releaseImage: quay.io/openshift-release-dev/ocp-release:4.8.43-x86_64 status: {} diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml index a962a689d7135..4ca3d8d1fff32 100644 --- a/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml +++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml @@ -18,7 +18,7 @@ spec: hibernationConfig: resumeTimeout: 20m0s imageSetRef: - name: ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0 + name: ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-aws-us-east-1 diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-west-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-west-1_clusterpool.yaml index 34ac3cd80274e..0cc26aa1a7fa9 100644 --- a/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-west-1_clusterpool.yaml +++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-10-0-amd64-aws-us-west-1_clusterpool.yaml @@ -18,7 +18,7 @@ spec: hibernationConfig: resumeTimeout: 20m0s imageSetRef: - name: ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0 + name: ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-aws-us-west-1 diff --git a/clusters/hive/pools/openshift-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/openshift-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml index 73dafb87bbd70..0ba8afaafd84e 100644 --- a/clusters/hive/pools/openshift-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml +++ b/clusters/hive/pools/openshift-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml @@ -18,7 +18,7 @@ spec: hibernationConfig: resumeTimeout: 20m0s imageSetRef: - name: ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0 + name: ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-aws-us-east-1 diff --git a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml index 961e9019e9d1d..c1f0c9bb5bd95 100644 --- a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml +++ b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-10-0-amd64-aws-us-east-1_clusterpool.yaml @@ -18,7 +18,7 @@ spec: hibernationConfig: resumeTimeout: 20m0s imageSetRef: - name: ocp-release-4.10.17-x86-64-for-4.10.0-0-to-4.11.0-0 + name: ocp-release-4.10.18-x86-64-for-4.10.0-0-to-4.11.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-aws-us-east-1 diff --git a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml index e308dadf1bfca..b448e3df31790 100644 --- a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml +++ b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-8-0-amd64-aws-us-east-1_clusterpool.yaml @@ -18,7 +18,7 @@ spec: hibernationConfig: resumeTimeout: 20m0s imageSetRef: - name: ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0 + name: ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-aws-us-east-1 diff --git a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-9-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-9-0-amd64-aws-us-east-1_clusterpool.yaml index 15c21d747073a..395e5d8ac078c 100644 --- a/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-9-0-amd64-aws-us-east-1_clusterpool.yaml +++ b/clusters/hive/pools/rhecoedge-nvidia-ci/ci-ocp-4-9-0-amd64-aws-us-east-1_clusterpool.yaml @@ -18,7 +18,7 @@ spec: hibernationConfig: resumeTimeout: 20m0s imageSetRef: - name: ocp-release-4.8.42-x86-64-for-4.8.0-0-to-4.9.0-0 + name: ocp-release-4.8.43-x86-64-for-4.8.0-0-to-4.9.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-aws-us-east-1