OCPBUGS-19018: use $CPE_NAME to find the OS major version #2003
Conversation
openshift-ci-robot
added
jira/severity-important
|
@derekhiggins: This pull request references Jira Issue OCPBUGS-19018, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. 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 kubernetes/test-infra repository. |
|
Maybe it'd be a bit clearer to separate the /lgtm |
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@LorbusChris: This pull request references Jira Issue OCPBUGS-19018, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: 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 kubernetes/test-infra repository. |
|
/retest-required |
openshift-ci
bot
added
the
acknowledge-critical-fixes-only
|
@derekhiggins what does scos mean? What is the CPE_NAME variable? |
|
SCOS == CentOS Stream CoreOS The CPE_NAME is from I wouldn't mind using the CPE_NAME only on SCOS, and leaving the RHCOS case as-is. |
I can do this, but it would require that I duplicate the sed line to remove the minor version
I know the minor version isn't in this part of the CPE but it was in the past https://access.redhat.com/solutions/6564691 |
openshift-ci
bot
added
the
approved
bindata/network/multus/multus.yaml
Outdated
| @@ -39,6 +39,8 @@ data: | |||
| # detect which version we're using in order to copy the proper binaries | |||
| case "${ID}" in | |||
| rhcos|scos) | |||
| IFS=':' read -ra parts <<< "$CPE_NAME" | |||
There was a problem hiding this comment.
probably a non-issue but should this be
| IFS=':' read -ra parts <<< "$CPE_NAME" | |
| local IFS=':' read -ra parts <<< "$CPE_NAME" |
so the changed IFS doesn't leak?
There was a problem hiding this comment.
There was a problem hiding this comment.
hmm, I didn't think it would leak because its being set inline, but may IFS is special, either way I could just use
echo $CPE_NAME | cut -f 4 -d :
like the lines below
There was a problem hiding this comment.
I think you may be right about the inline setting of IFS here.
Nonetheless, I personally find using cut easier to understand. Mind changing it?
There was a problem hiding this comment.
Done, I'd have used cut in the first place if I noticed the pattern already being used in the file...
openshift-ci
bot
added
the
do-not-merge/hold
|
/lgtm cancel |
RHEL_VERSION isn't present in scos, but $CPE_NAME is present in /etc/os-release on both distros.
derekhiggins
force-pushed
the
usecpe
branch
from
163c132
to
9f83883
Compare
|
/lgtm I'll leave it to @trozet to lift the hold |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: derekhiggins, LorbusChris, trozet 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 |
|
/retest-required |
|
/cherrypick release-4.14 |
|
@LorbusChris: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you. 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 kubernetes/test-infra repository. |
|
I've got the green light from Tim |
openshift-ci
bot
removed
the
do-not-merge/hold
|
@derekhiggins: The following tests failed, say
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. |
openshift-merge-robot
merged commit 6888ace
into
openshift:master
|
@derekhiggins: Jira Issue OCPBUGS-19018: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-19018 has been moved to the MODIFIED state. 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 kubernetes/test-infra repository. |
|
@LorbusChris: new pull request created: #2017 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 kubernetes/test-infra repository. |
|
Fix included in accepted release 4.15.0-0.nightly-2023-09-27-073353 |
RHEL_VERSION isn't present in scos