OKD-322: Update OC-tools Dockerfile to work on CentOS/RHEL 10#2205
OKD-322: Update OC-tools Dockerfile to work on CentOS/RHEL 10#2205jatinsu wants to merge 1 commit intoopenshift:mainfrom
Conversation
|
@jatinsu: This pull request references OKD-322 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set. DetailsIn 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. |
|
No actionable comments were generated in the recent review. 🎉 WalkthroughAdds runtime detection and selection of the iotop package in the Dockerfile: a deprecation comment is added; availability is checked with Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
images/tools/Dockerfile
Outdated
| COPY --from=builder /go/src/github.com/openshift/oc/images/tools/sos.conf /etc/sos/ | ||
| RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done | ||
| RUN INSTALL_PKGS="\ | ||
| RUN MAJOR_VERSION=$(. /etc/os-release && echo "${VERSION_ID%%.*}") && \ |
There was a problem hiding this comment.
I think we should try to avoid testing based on OS versions;
What about this
| RUN MAJOR_VERSION=$(. /etc/os-release && echo "${VERSION_ID%%.*}") && \ | |
| # iotop has been deprecated. iotop-c is used Cento10 and upwards | |
| RUN if yum list iotop >/dev/null 2>&1; then IOTOP_PKG="iotop"; else IOTOP_PKG="iotop-c"; fi && |
I'd like to hear opinions from @ingvagabund as well
There was a problem hiding this comment.
Works for me! I just tested this and it worked flawlessly. I'll wait to commit this until @ingvagabund gives their opinion.
There was a problem hiding this comment.
Feel free to commit, we can wait his comments during review
|
@jatinsu: This pull request references OKD-322 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set. DetailsIn 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. |
|
@jatinsu: This pull request references OKD-322 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set. DetailsIn 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. |
|
/retest |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ardaguclu, jatinsu The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest |
|
/retest |
|
@jatinsu: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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-sigs/prow repository. I understand the commands that are listed here. |
|
I think, this openshift/origin#30809 will fix the e2e-agnostic-ovn-cmd failure. |
Installation of
iotopworks on CentOS 10 but fails during verification as theiotophas been renamed toiotop-cin CentOS/RHEL 10.Summary by CodeRabbit