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

extensions: adapt for new rpm-ostree support #496

Merged
merged 1 commit into from
Feb 24, 2021

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Feb 4, 2021

With coreos/rpm-ostree#2439 and
coreos/coreos-assembler#2028, support for
extensions is now more robust.

The extensions.yaml file is now fed directly to rpm-ostree. We just need
to do some minor tweaks:

  • drop listing usbguard deps, rpm-ostree fetches them automatically
  • split the devel bits into two extensions: one is an OS extension which
    contains the devel and headers packages, and the other is a
    development extension containing kernel packages already in the base
    (marking it as a development extension will signal the MCO that it's
    not intended to be directly layered on the host)
  • use match-base-evr: kernel on those to enforce that the kernel
    development packages have the same EVR as the base kernel package in
    the OSTree

@jlebon
Copy link
Member Author

jlebon commented Feb 4, 2021

Needs coreos/coreos-assembler#2028.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 4, 2021
@jlebon jlebon force-pushed the pr/extensions-tweak branch from 255026c to 3ad6ec3 Compare February 5, 2021 16:25
@miabbott
Copy link
Member

Let's just hold this until the cosa PR merges

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 15, 2021
@jlebon jlebon force-pushed the pr/extensions-tweak branch from 3ad6ec3 to 192494f Compare February 22, 2021 16:29
@jlebon
Copy link
Member Author

jlebon commented Feb 23, 2021

cosa PR is merged now!
/hold cancel

/retest

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 23, 2021
@ashcrow ashcrow requested review from cgwalters and removed request for dustymabe February 23, 2021 15:55
oscontainer.yaml Outdated Show resolved Hide resolved
@miabbott
Copy link
Member

One suggestion, but otherwise LGTM!

/approve

With coreos/rpm-ostree#2439 and
coreos/coreos-assembler#2028, support for
extensions is now more robust.

The extensions.yaml file is now fed directly to rpm-ostree. We just need
to do some minor tweaks:
- drop listing usbguard deps, rpm-ostree fetches them automatically
- split the devel bits into two extensions: one is an OS extension which
  contains the devel and headers packages, and the other is a
  development extension containing kernel packages already in the base
  (marking it as a development extension will signal the MCO that it's
  not intended to be directly layered on the host)
- use `match-base-evr: kernel` on those to enforce that the kernel
  development packages have the same EVR as the base kernel package in
  the OSTree

The `cosa upload-oscontainer` command now also supports
`oscontainer.yaml` specifying "important" packages whose EVRA are
included directly as a label on the resulting image.
@jlebon jlebon force-pushed the pr/extensions-tweak branch from 192494f to 76f510c Compare February 23, 2021 16:33
@jlebon
Copy link
Member Author

jlebon commented Feb 23, 2021

/retest

@miabbott
Copy link
Member

fatal: Missing /dev/kvm

I think @cgwalters was chasing this down as part of

openshift/release#16197
openshift/release#16193

@jlebon
Copy link
Member Author

jlebon commented Feb 24, 2021

So... since CI is broken but doesn't cover this anyway, and this is blocking pipelines, let's just get this in? Then we get to actual regressions in this new path sooner and can fix them sooner too. :)

@cgwalters
Copy link
Member

Yeah, that's fine by me.
/override ci/prow/unit

@openshift-ci-robot
Copy link

@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/unit

In response to this:

Yeah, that's fine by me.
/override ci/prow/unit

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.

@jlebon
Copy link
Member Author

jlebon commented Feb 24, 2021

Now just needs a /lgtm!

@miabbott
Copy link
Member

/lgtm

For xref purposes, CI failures tracking in #506

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 24, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlebon, miabbott

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jlebon jlebon deleted the pr/extensions-tweak branch April 23, 2023 19:56
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. 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