USHIFT-2370: Changes to allow MicroShift 4.16 to build on RHEL 9.4 Beta #3220
Conversation
|
@dhensel-rh: This pull request references USHIFT-2370 which is a valid jira issue. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci-robot
added
the
jira/valid-reference
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
@dhensel-rh: This pull request references USHIFT-2370 which is a valid jira issue. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
Skipping CI for Draft Pull Request. |
scripts/image-builder/configure.sh
Outdated
| @@ -23,6 +23,13 @@ fi | |||
| createrepo yum-utils selinux-policy-devel jq wget lorax rpm-build \ | |||
| containernetworking-plugins expect" | |||
|
|
|||
| VID=$(source /etc/os-release && echo "${VERSION_ID}") | |||
| if { [[ "${VID}" == "9.4" ]] && grep -qE 'Red Hat Enterprise Linux.*Beta' /etc/redhat-release; }; then | |||
There was a problem hiding this comment.
I know we're not going to see a RHEL 9.5 for a minute, but could this be generalized so it's not something we have to continually update? Maybe we could detect if it's a beta version?
There was a problem hiding this comment.
Yes, we should probably change it to be more generic, something like the following
if grep -qE 'Red Hat Enterprise Linux.*Beta' /etc/redhat-release; then
VID=$(source /etc/os-release && echo "${VERSION_ID}")
sudo sed -i "s,dist/rhel9/${VID},beta/rhel9/9,g" /usr/share/osbuild-composer/repositories/rhel-${VID}.json
fi
dhensel-rh
changed the title
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
/retest |
|
/retest |
|
/retest |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: copejon, dhensel-rh The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
@dhensel-rh: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Which issue(s) this PR addresses:
Closes #USHIFT-2370