Skip to content

Fix cli, cli-artifacts image generation for okd scos #51533

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

Merged
openshift-merge-bot merged 1 commit into from
May 6, 2024
Merged

Fix cli, cli-artifacts image generation for okd scos #51533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 5 additions & 23 deletions ci-operator/config/openshift/oc/openshift-oc-master__okd-scos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,24 @@
base_images:
ocp_builder_rhel-8-golang-1.20-openshift-4.16:
name: builder
namespace: ocp
tag: rhel-8-golang-1.20-openshift-4.16
ocp_builder_rhel-8-golang-1.21-openshift-4.16:
name: builder
namespace: ocp
tag: rhel-8-golang-1.21-openshift-4.16
ocp_builder_rhel-9-golang-1.20-openshift-4.16:
name: builder
namespace: ocp
tag: rhel-9-golang-1.20-openshift-4.16
ocp_builder_rhel-9-golang-1.21-openshift-4.16:
name: builder

@Prashanth684 Prashanth684 Apr 30, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@jupierce is this something that needs to be corrected in the automation, i.e the generation of rhel9 golang-1.21 builder images

namespace: ocp
tag: rhel-9-golang-1.21-openshift-4.16
origin_scos-4.16_base-stream8:
origin_scos-4.16_base-stream9:
name: scos-4.16
namespace: origin
tag: base-stream8
tag: base-stream9
build_root:
image_stream_tag:
name: builder
namespace: ocp
tag: rhel-8-golang-1.21-openshift-4.16
tag: rhel-9-golang-1.21-openshift-4.16
images:
- build_args:
- name: TAGS
value: scos
dockerfile_path: images/cli/Dockerfile.rhel
from: origin_scos-4.16_base-stream8
from: origin_scos-4.16_base-stream9
inputs:
ocp_builder_rhel-8-golang-1.21-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
ocp_builder_rhel-9-golang-1.21-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
Expand All @@ -50,10 +35,7 @@ images:
dockerfile_path: images/cli-artifacts/Dockerfile.rhel
from: cli
inputs:
ocp_builder_rhel-8-golang-1.20-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
ocp_builder_rhel-9-golang-1.20-openshift-4.16:
ocp_builder_rhel-9-golang-1.21-openshift-4.16:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
to: cli-artifacts
Expand Down