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

Update to f39 #3653

Merged
merged 5 commits into from
Nov 16, 2023
Merged

Update to f39 #3653

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a0bd7c
Update to f39
cgwalters Nov 9, 2023
959eea7
build: Unfreeze grub2
cgwalters Nov 9, 2023
2e24c46
tests/test_cosalib_meta.py: don't deepcopy GenericBuildMeta
jlebon Nov 14, 2023
dbf5460
Dockerfile: use Quay.io Fedora image instead
jlebon Nov 15, 2023
6296a16
create_disk.sh: opt out of EXT4 orphan_file feature on older targets
jlebon Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# When rebasing to new Fedora, also update openshift/release:
# https://github.com/openshift/release/tree/master/ci-operator/config/coreos/coreos-assembler/coreos-coreos-assembler-main.yaml
FROM registry.fedoraproject.org/fedora:38
FROM registry.fedoraproject.org/fedora:39
WORKDIR /root/containerbuild

# Keep this Dockerfile idempotent for local development rebuild use cases.
Expand Down
10 changes: 1 addition & 9 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,6 @@ install_rpms() {

frozendeps=""

# freeze grub2 for https://github.com/coreos/coreos-assembler/issues/3370
case "${arch}" in
x86_64) frozendeps=$(echo grub2-{common,tools,tools-extra,tools-minimal,efi-x64,pc,pc-modules}-1:2.06-76.fc38);;
aarch64) frozendeps=$(echo grub2-{common,tools,tools-extra,tools-minimal,efi-aa64}-1:2.06-76.fc38);;
ppc64le) frozendeps=$(echo grub2-{common,tools,tools-extra,tools-minimal,ppc64le,ppc64le-modules}-1:2.06-76.fc38);;
*) ;;
esac

# First, a general update; this is best practice. We also hit an issue recently
# where qemu implicitly depended on an updated libusbx but didn't have a versioned
# requires https://bugzilla.redhat.com/show_bug.cgi?id=1625641
Expand Down Expand Up @@ -172,7 +164,7 @@ write_archive_info() {
patch_osbuild() {
# A few patches that either haven't made it into a release or
# that will be obsoleted with other work that will be done soon.
cat /usr/lib/coreos-assembler/*.patch | patch -p1 -d /usr/lib/python3.11/site-packages/
cat /usr/lib/coreos-assembler/*.patch | patch -p1 -d /usr/lib/python3.12/site-packages/
}

if [ $# -ne 0 ]; then
Expand Down
6 changes: 3 additions & 3 deletions tests/test_cosalib_meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ def get_aws(x, key="path"):
m = meta.GenericBuildMeta(_create_test_files(tmpdir, meta_data=td),
'1.2.3')

# create working copies
w = meta.GenericBuildMeta(_create_test_files(tmpdir, meta_data=td),
'1.2.3')
# create working copies
if x is None:
x = copy.deepcopy(m)
x = w
else:
y = copy.deepcopy(m)
y = w

# add the stamp
m.write()
Expand Down