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.

Sign up for GitHub

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

Jump to bottom

changes to master branch for RHCOS 4.9 builds #566

Merged
merged 3 commits into from
Jun 18, 2021
Merged

changes to master branch for RHCOS 4.9 builds #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28363f9
gitmodules: use testing-devel branch for fedora-coreos-config
miabbott Jun 18, 2021
50a2bda
manifest: update version strings for 4.9
miabbott Jun 18, 2021
a877d6f
rhcos-packages: drop pin for 8.4 Beta
miabbott Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "fedora-coreos-config"]
path = fedora-coreos-config
url = https://github.com/coreos/fedora-coreos-config
branch = rhcos-4.8
branch = testing-devel
2 changes: 1 addition & 1 deletion fedora-coreos-config
Open in desktop
Submodule fedora-coreos-config updated 43 files
+6 −5 .cci.jenkinsfile
+46 −0 .github/workflows/remove-graduated-overrides.yml
+58 −73 README.md
+2 −2 ci/buildroot/Dockerfile
+1 −1 ci/buildroot/buildroot-specs.txt
+125 −0 ci/remove-graduated-overrides.py
+0 −5 fedora-next.repo
+0 −5 fedora.repo
+0 −5 image.yaml
+19 −33 manifest-lock.overrides.yaml
+407 −425 manifest-lock.x86_64.json
+4 −3 manifest.yaml
+2 −0 manifests/bootable-rpm-ostree.yaml
+3 −27 manifests/fedora-coreos-base.yaml
+19 −0 overlay.d/05core/usr/lib/coreos/generator-lib.sh
+21 −0 overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-kargs-reboot.service
+4 −0 overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-kargs.sh
+0 −37 overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-teardown-initramfs.sh
+6 −0 overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/module-setup.sh
+0 −7 overlay.d/05core/usr/lib/dracut/modules.d/35coreos-network/50-nm-run-only-if-neednet.conf
+0 −4 overlay.d/05core/usr/lib/dracut/modules.d/35coreos-network/module-setup.sh
+31 −4 overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-firstboot-uuid
+0 −3 overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh
+12 −0 overlay.d/05core/usr/lib/dracut/modules.d/60coreos-agetty-workaround/coreos-touch-run-agetty.service
+21 −0 overlay.d/05core/usr/lib/dracut/modules.d/60coreos-agetty-workaround/module-setup.sh
+3 −7 overlay.d/05core/usr/lib/systemd/system-generators/coreos-boot-mount-generator
+1 −17 overlay.d/05core/usr/lib/systemd/system-generators/coreos-liveiso-autologin-generator
+11 −0 overlay.d/09misc/usr/lib/tmpfiles.d/coreos-fix-etc-ownership.conf
+2 −5 overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
+11 −0 overlay.d/15fcos/usr/lib/systemd/system/coreos-check-cgroups.service
+0 −11 overlay.d/15fcos/usr/lib/systemd/system/coreos-reset-stub-resolv-selinux-context.path
+0 −18 overlay.d/15fcos/usr/lib/systemd/system/coreos-reset-stub-resolv-selinux-context.service
+25 −0 overlay.d/15fcos/usr/libexec/coreos-check-cgroups.sh
+6 −10 overlay.d/README.md
+5 −2 tests/kola/chrony/dhcp-propagation
+9 −0 tests/kola/ignition/kargs/config.ign
+19 −0 tests/kola/ignition/kargs/test.sh
+14 −0 tests/kola/ignition/systemd-enable-instance-unit/config.fcc
+31 −0 tests/kola/ignition/systemd-enable-instance-unit/test.sh
+4 −0 tests/kola/ignition/systemd-unmasking/test.sh
+55 −0 tests/kola/kdump/test.sh
+29 −45 tests/kola/misc-ro
+4 −1 tests/kola/rpm-ostree-countme/test.sh
4 changes: 2 additions & 2 deletions manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ repos:
- rhel-8-server-ose

# We include hours/minutes to avoid version number reuse
automatic-version-prefix: "48.84.<date:%Y%m%d%H%M>"
automatic-version-prefix: "49.84.<date:%Y%m%d%H%M>"
# This ensures we're semver-compatible which OpenShift wants
automatic-version-suffix: "-"
mutate-os-release: "4.8"
mutate-os-release: "4.9"

documentation: false
initramfs-args:
Expand Down
2 changes: 1 addition & 1 deletion rhcos-packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ packages:
# installer iso packages
- coreos-installer coreos-installer-bootinfra
- ignition
- redhat-release-coreos-48.84 # Pinned for 8.4 Beta switch
- redhat-release-coreos
## Delivered via RHEL Base/Appstream (usually)
# needed by rpm-ostree for managing users
- nss-altfiles
Expand Down