Skip to content

RHCOS: Setup 4.11 COSA and other related fixes #29258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
travier wants to merge 3 commits into from
Closed

RHCOS: Setup 4.11 COSA and other related fixes #29258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
571687d
ci-operator/openshift/os: Use 4.11 builders for 4.11+
travier Jun 8, 2022
2133b5f
ci-operator/openshift/os: Use Fedora 36 for 4.11+
travier Jun 8, 2022
b2d43fb
ci-operator/openshift/os: master is now 4.12
travier Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ci-operator/config/openshift/os/openshift-os-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ base_images:
fedora:
name: fedora
namespace: coreos
tag: "35"
ocp_builder_rhel-8-golang-1.17-openshift-4.10:
tag: "36"
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
name: builder
namespace: ocp
tag: rhel-8-golang-1.17-openshift-4.10
tag: rhel-8-golang-1.17-openshift-4.11
build_root:
image_stream_tag:
name: fcos-buildroot
Expand All @@ -22,9 +22,9 @@ images:
coreos_coreos-assembler_latest:
as:
- registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
ocp_builder_rhel-8-golang-1.17-openshift-4.10:
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
to: build-test-qemu-img
- dockerfile_literal: |
# This stage actually builds the RHCOS OCI image. However, due to
Expand Down Expand Up @@ -120,17 +120,17 @@ promotion:
disabled: true
excluded_images:
- '*'
name: "4.11"
name: "4.12"
namespace: ocp
releases:
initial:
integration:
name: "4.11"
name: "4.12"
namespace: ocp
latest:
integration:
include_built_images: true
name: "4.11"
name: "4.12"
namespace: ocp
resources:
'*':
Expand Down
10 changes: 5 additions & 5 deletions ci-operator/config/openshift/os/openshift-os-release-4.11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ base_images:
fedora:
name: fedora
namespace: coreos
tag: "35"
ocp_builder_rhel-8-golang-1.17-openshift-4.10:
tag: "36"
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
name: builder
namespace: ocp
tag: rhel-8-golang-1.17-openshift-4.10
tag: rhel-8-golang-1.17-openshift-4.11
build_root:
image_stream_tag:
name: fcos-buildroot
Expand All @@ -22,9 +22,9 @@ images:
coreos_coreos-assembler_4.11:
as:
- registry.svc.ci.openshift.org/coreos/coreos-assembler:4.11
ocp_builder_rhel-8-golang-1.17-openshift-4.10:
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
to: build-test-qemu-img
promotion:
disabled: true
Expand Down
10 changes: 5 additions & 5 deletions ci-operator/config/openshift/os/openshift-os-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ base_images:
fedora:
name: fedora
namespace: coreos
tag: "35"
ocp_builder_rhel-8-golang-1.17-openshift-4.10:
tag: "36"
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
name: builder
namespace: ocp
tag: rhel-8-golang-1.17-openshift-4.10
tag: rhel-8-golang-1.17-openshift-4.11
build_root:
image_stream_tag:
name: fcos-buildroot
Expand All @@ -22,9 +22,9 @@ images:
coreos_coreos-assembler_latest:
as:
- registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
ocp_builder_rhel-8-golang-1.17-openshift-4.10:
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
to: build-test-qemu-img
promotion:
excluded_images:
Expand Down