Skip to content
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

COS-2746: common.yaml: add dnf #1476

Merged
merged 2 commits into from
Apr 12, 2024
Merged

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Apr 4, 2024

As per discussions in
coreos/fedora-coreos-tracker#1687, we will add dnf to RHCOS so it can be used for derivation.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 4, 2024
@jlebon
Copy link
Member Author

jlebon commented Apr 4, 2024

Testing this, the biggest roadblock of course is entitlements. This is a known issue tracked at least within the MCO team and not something we need to address at the OS level. But anyway, hacking around that by just adding some internal repos, I sanity-checked derivations using dnf work fine:

$ cat src/config/Containerfile.test
FROM overridden
COPY rhel-9.4.repo /etc/yum.repos.d
RUN dnf install -y ltrace && ostree container commit
$ cosa buildextend-layered test
...
$ cosa run
...
[core@cosa-devsh ~]$ sudo -i
[root@cosa-devsh ~]# bootc switch --transport oci-archive $(ls /mnt/workdir/builds/latest/x86_64/*test*.ociarchive)
layers already present: 0; layers needed: 53 (1.2 GB)
 18.49 MiB [████████████████████] (0s) Fetched layer sha256:dfb4c7216493
Queued for next boot: ostree-unverified-image:oci-archive:/mnt/workdir/builds/latest/x86_64/rhcos-416.94.202404041902-0-layered-test.x86_64.ociarchive
  Version: 416.94.202404041902-0
  Digest: sha256:590e833b104874332eb2d5d26c79b3a72de62213c2266f69c39d81a0cac96b1d
[root@cosa-devsh ~]# reboot
...
[core@cosa-devsh ~]$ ltrace
ltrace: too few arguments
Try `ltrace --help' for more information.

@jlebon
Copy link
Member Author

jlebon commented Apr 5, 2024

/retest

@jlebon
Copy link
Member Author

jlebon commented Apr 10, 2024

/retest

Copy link
Contributor

@c4rt0 c4rt0 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 10, 2024
@jlebon jlebon changed the title common.yaml: add dnf COS-2746: common.yaml: add dnf Apr 10, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 10, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 10, 2024

@jlebon: This pull request references COS-2746 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 task to target the "4.16.0" version, but no target version was set.

In response to this:

As per discussions in
coreos/fedora-coreos-tracker#1687, we will add dnf to RHCOS so it can be used for derivation.

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.

@jlebon
Copy link
Member Author

jlebon commented Apr 10, 2024

/retest

@openshift-bot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 94146f6 and 2 for PR HEAD 04581ec in total

@openshift-bot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 15bd01d and 1 for PR HEAD 04581ec in total

jlebon added 2 commits April 11, 2024 10:57
As per discussions in
coreos/fedora-coreos-tracker#1687, we will add
dnf to RHCOS so it can be used for derivation.
That unit is enabled by default, but isn't actually activated on
OSTree systems. Outright disable it because otherwise it pulls in
`network-online.target` which we require to not be activated by default.
@jlebon
Copy link
Member Author

jlebon commented Apr 11, 2024

OK interesting. CI is failing because network-online.target is getting activated by dnf-makecache.timer. That timer unit isn't actually functioning on OSTree systems (it has ConditionPathExists=!/run/ostree-booted) but systemd still respects its requirements. I've added a preset for now to disable it outright, but ISTM like that timer should just drop that dependency. It triggers every hour, so it'll eventually converge.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 11, 2024
@travier
Copy link
Member

travier commented Apr 12, 2024

I've confirmed that this should be the only unit added (at least for the dnf package).
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 12, 2024
Copy link
Contributor

openshift-ci bot commented Apr 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: c4rt0, jlebon, travier

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:
  • OWNERS [c4rt0,jlebon,travier]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

openshift-ci bot commented Apr 12, 2024

@jlebon: 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.

@openshift-merge-bot openshift-merge-bot bot merged commit 5952655 into openshift:master Apr 12, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants