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

changes to master branch for RHCOS 4.9 builds #566

Merged
merged 3 commits into from Jun 18, 2021

Conversation

miabbott
Copy link
Member

@miabbott miabbott commented Jun 18, 2021

gitmodules: use testing-devel branch for fedora-coreos-config


gitmodules: use testing-devel branch for fedora-coreos-config

Also bump submodule to HEAD of testing-devel

$ git shortlog --no-merges 6f39113b0bd0e40d783edcfedc69b93b0492b096..43eb8766112420a2a24d3f872da088bbd752aa48
Andy McCrae (1):
      Move comments in systemd services to own line

Colin Walters (3):
      coreos-boot-mount-generator: Move all "exit 0" checks to early on
      udev/90-coreos-device-mapper: Create label links in real root too
      coreos-boot-mount-generator: Always use mpath for /boot if rd.multipath

Dusty Mabe (1):
      overlay: initramfs teardown: add support for coreos.force_persist_ip karg

Jonathan Lebon (10):
      ignition-ostree-growfs: don't conditionalize on root= karg
      ignition-ostree-growfs: fix dependency to sysroot mount
      overlay: convert more unit descriptions to Title Case
      coreos-gpt-setup: log whether sgdisk was called
      ignition-ostree-uuid-root: also run if root= is provided
      live-generator: don't call `man bootup`
      Add support for multipath on firstboot
      coreos-gpt-setup: add support for multipath
      ignition-ostree-growfs: add support for multipath
      udev/90-coreos-device-mapper: ignore DM_ACTIVATION

rhcos-packages: drop pin for 8.4 Beta

@openshift-ci openshift-ci bot requested review from dustymabe and zonggen June 18, 2021 15:46
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 18, 2021
@miabbott
Copy link
Member Author

Locally built successfully; still running cosa kola run

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

LGTM overall!

gitmodules: use testing-devel branch for fedora-coreos-config

Shouldn't we also bump the submodule to make that true? Right now, it's still pointing to the tip of the rhcos-4.8 branch.

@miabbott
Copy link
Member Author

Shouldn't we also bump the submodule to make that true? Right now, it's still pointing to the tip of the rhcos-4.8 branch.

Yup, good point. Will update.

@miabbott
Copy link
Member Author

Might need this openshift/release#19451

@miabbott
Copy link
Member Author

With the submodule bump, this locally built + tested successfully. And with openshift/release#19451 merged, let's see if we can get the jobs to pass...

/retest

@jlebon
Copy link
Member

jlebon commented Jun 18, 2021

Hmm, I'm not seeing the submodule bump here. Forgot a git add? :)

@miabbott
Copy link
Member Author

Hmm, I'm not seeing the submodule bump here. Forgot a git add? :)

Huh...let me try again

Also bump submodule to HEAD of testing-devel

```
$ git shortlog --no-merges 6f39113b0bd0e40d783edcfedc69b93b0492b096..43eb8766112420a2a24d3f872da088bbd752aa48
Andy McCrae (1):
      Move comments in systemd services to own line

Colin Walters (3):
      coreos-boot-mount-generator: Move all "exit 0" checks to early on
      udev/90-coreos-device-mapper: Create label links in real root too
      coreos-boot-mount-generator: Always use mpath for /boot if rd.multipath

Dusty Mabe (1):
      overlay: initramfs teardown: add support for coreos.force_persist_ip karg

Jonathan Lebon (10):
      ignition-ostree-growfs: don't conditionalize on root= karg
      ignition-ostree-growfs: fix dependency to sysroot mount
      overlay: convert more unit descriptions to Title Case
      coreos-gpt-setup: log whether sgdisk was called
      ignition-ostree-uuid-root: also run if root= is provided
      live-generator: don't call `man bootup`
      Add support for multipath on firstboot
      coreos-gpt-setup: add support for multipath
      ignition-ostree-growfs: add support for multipath
      udev/90-coreos-device-mapper: ignore DM_ACTIVATION
```
Copy link
Member

@jlebon jlebon 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 Jun 18, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 18, 2021

[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

@openshift-merge-robot openshift-merge-robot merged commit f683733 into openshift:master Jun 18, 2021
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.

None yet

3 participants