Skip to content
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

ART-8910: Switch to multi in ci #5618

Merged
merged 4 commits into from
Nov 22, 2024
Merged

ART-8910: Switch to multi in ci #5618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2800a4
standardize on openshift-enterprise-base-rhel9
joepvd Nov 4, 2024
c97a43e
Point CI base images to multi images
joepvd Nov 4, 2024
b913879
Golang builders to multi
joepvd Nov 4, 2024
f71472b
Point ci build root images to multi
joepvd Nov 4, 2024
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
6 changes: 0 additions & 6 deletions ci_transforms/rhel-7/base-repos/Dockerfile
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions ci_transforms/rhel-7/ci-build-root/Dockerfile
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions ci_transforms/rhel-7/golang/Dockerfile
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ci_transforms/rhel-8/base-repos/Dockerfile
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions ci_transforms/rhel-8/ci-build-root/Dockerfile
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ci_transforms/rhel-8/ci-build-root/OWNERS
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions ci_transforms/rhel-8/golang/Dockerfile
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions ci_transforms/rhel-9/ci-build-root/Dockerfile
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions ci_transforms/rhel-9/golang/Dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion images/atomic-openshift-cluster-autoscaler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ for_payload: true
from:
builder:
- stream: rhel-9-golang
member: openshift-base-rhel9
member: openshift-enterprise-base-rhel9
labels:
License: ASL 2.0
io.k8s.description: Cluster Autoscaler for OpenShift and Kubernetes.
Expand Down
10 changes: 9 additions & 1 deletion images/ci-openshift-base.rhel9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ content:
enabled: false
mirror: true
mirror_manifest_list: true
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-enterprise-base-multi-openshift-{MAJOR}.{MINOR}
upstream_image: registry.ci.openshift.org/ocp/{MAJOR}.{MINOR}:base-rhel9

okd_alignment:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we could produce an image based on https://quay.io/centos/centos:stream9 with our https://github.com/openshift-eng/ocp-build-data/blob/openshift-4.18/ci_images/dnf_wrapper.sh script installed on top of it.
For OKD, this base image can't be based on RHEL. It must be based on centos stream. This makes it impossible to build the desired image in OSBS.
okd_alignment only instructs the creation of PRs in openshift/release which build OKD variants of images when PR merge in upstream component repositories.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed https://issues.redhat.com/browse/ART-11433

# The tag name in the okd stream to which this image should be promoted
tag_name: base-stream9
inject_rpm_repositories:
- id: rhel-9-server-ose
baseurl: http://base-{MAJOR}-{MINOR}-rhel9.ocp.svc/rhel-9-server-ose

from:
member: openshift-enterprise-base-rhel9
labels:
Expand Down
2 changes: 1 addition & 1 deletion images/ci-openshift-build-root-latest.rhel8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ content:
enabled: false
mirror: true
mirror_manifest_list: true
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}
from:
member: ci-openshift-golang-builder-latest.rhel8
labels:
Expand Down
2 changes: 1 addition & 1 deletion images/ci-openshift-build-root-latest.rhel9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ content:
enabled: false
mirror: true
mirror_manifest_list: true
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}
from:
member: ci-openshift-golang-builder-latest.rhel9
labels:
Expand Down
2 changes: 1 addition & 1 deletion images/ci-openshift-build-root-previous.rhel8.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ content:
enabled: false
mirror: true
mirror_manifest_list: true
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_PREVIOUS}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR}
from:
member: ci-openshift-golang-builder-previous.rhel8
labels:
Expand Down
2 changes: 1 addition & 1 deletion images/ci-openshift-build-root-previous.rhel9.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ content:
enabled: false
mirror: true
mirror_manifest_list: true
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_PREVIOUS}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR}
from:
member: ci-openshift-golang-builder-previous.rhel9
labels:
Expand Down
5 changes: 4 additions & 1 deletion images/ci-openshift-golang-builder-latest.rhel8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ content:
enabled: false
mirror: true
mirror_manifest_list: true
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-builder-multi-openshift-{MAJOR}.{MINOR}
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}
upstream_image_mirror:
- registry.ci.openshift.org/ocp-private/builder-priv:rhel-8-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}

from:
stream: rhel-8-golang-{GO_LATEST}
labels:
Expand Down
5 changes: 4 additions & 1 deletion images/ci-openshift-golang-builder-latest.rhel9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ content:
enabled: false
mirror: true
mirror_manifest_list: true
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-builder-multi-openshift-{MAJOR}.{MINOR}
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}
upstream_image_mirror:
- registry.ci.openshift.org/ocp-private/builder-priv:rhel-9-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}

from:
stream: rhel-9-golang-{GO_LATEST}
labels:
Expand Down
5 changes: 4 additions & 1 deletion images/ci-openshift-golang-builder-previous.rhel8.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ content:
enabled: false
mirror: true
mirror_manifest_list: true
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_PREVIOUS}-builder-multi-openshift-{MAJOR}.{MINOR}
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR}
upstream_image_mirror:
- registry.ci.openshift.org/ocp-private/builder-priv:rhel-8-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR}

from:
stream: rhel-8-golang-{GO_PREVIOUS}
labels:
Expand Down
Loading
Loading