-
Notifications
You must be signed in to change notification settings - Fork 165
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.
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
[rhcos-4.11-new] Dockerfile: Add repovar for RHCOS repos #3198
Conversation
I think for this maybe it would be better to put it in the pipeline directly and use environment variables in the form of |
I think the only issue with that is, if someone wants to test it manually and is not aware of it, cosa fetch will fail. Because the var repo definition will be only in the pipeline. If we go for it, would be nice to have something in the cosa fetch help message about it. |
Currently in Prow jobs we do https://github.com/openshift/os/blob/cc5fef39c588c11892c9250e8a33e2ecb1ee18fa/ci/get-ocp-repo.sh#L3 I think it'd make sense short term to lower support for that into coreos-assembler. |
Hmm, or lower it into rpm-ostree? We could also formalize OCP release references. Something like: variables:
osversion: "rhel-8.6"
ocprelease: "4.12"
repos:
- rhel-8-baseos
- rhel-8-appstream
- rhel-8-fast-datapath
- rhel-8-server-ose
repovars:
ocprelease: "${ocprelease}"
mutate-os-release: "${ocprelease}" |
Proposal in coreos/rpm-ostree#4152. |
👍 - for the older releases that won't get a new version of |
32081b7
to
6db7fc6
Compare
6db7fc6
to
1b2347e
Compare
Thanks all, for checking it. |
the old PR was creating a file named |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the old PR was creating a file named
OCP_RELEASE
. This one is creating a file namedocprelease
. Which one is more appropriate?
Cool either way but slightly prefer the latter for consistency with the traditional other urlvars like releasever
and basearch
.
Dockerfile
Outdated
@@ -35,6 +35,10 @@ RUN chmod g=u /etc/passwd | |||
# also allow adding certificates | |||
RUN chmod -R g=u /etc/pki/ca-trust | |||
|
|||
# Add dnf repovar to be used in the RHCOS repos | |||
RUN mkdir -p /etc/dnf/var |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Super minor: We can drop this and assume it exists. Avoids adding another layer to the image. :)
- For old releases, the feature adding support for repovars in rpm-ostree don't work. That's why we are adding it manually. - It is need to determine the ocp version for repos like rhel-8-server-ose, in order the use a single branch for the internal redhat-coreos repo. More info: - coreos/rpm-ostree#4152 Signed-off-by: Renata Ravanelli <rravanel@redhat.com>
1b2347e
to
7f9b582
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@ravanelli: The following test 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. |
CI failure is expected: |
rhel-8-server-ose
repository configuration. It is needed in order to use a single branch for the internal redhat-coreos repo,Signed-off-by: Renata Ravanelli rravanel@redhat.com