Skip to content

Make default 4.6 base image ubi8 based #11349

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
jupierce merged 1 commit into from
Aug 27, 2020
Merged

Make default 4.6 base image ubi8 based #11349

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
16 changes: 5 additions & 11 deletions ci-operator/config/openshift/images/openshift-images-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
base_images:
base-os-8:
name: builder
namespace: ocp
tag: rhel-8-base-openshift-4.6
builder:
name: builder
namespace: ocp
Expand All @@ -11,10 +15,6 @@ base_images:
name: ubi
namespace: ocp
tag: "7"
os-8:
name: ubi
namespace: ocp
tag: "8"
build_root:
image_stream_tag:
name: release
Expand Down Expand Up @@ -50,7 +50,7 @@ images:
to: keepalived-ipfailover
promotion:
additional_images:
base: base-7
base: base-8
base-7: base-7
base-8: base-8
name: "4.6"
Expand All @@ -62,12 +62,6 @@ raw_steps:
curl http://base-4-6.ocp.svc > /etc/yum.repos.d/content.repo
from: os-7
to: base-os-7
- pipeline_image_cache_step:
commands: |
rm -rf /etc/yum.repos.d/*
curl http://base-4-6-rhel8.ocp.svc > /etc/yum.repos.d/content.repo
from: os-8
to: base-os-8
Copy link
Member

@petr-muller petr-muller Aug 27, 2020

Choose a reason for hiding this comment

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

This is used to build base-8

Copy link
Contributor Author

@jupierce jupierce Aug 27, 2020

Choose a reason for hiding this comment

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

Thanks, @petr-muller!

resources:
'*':
requests:
Expand Down