Skip to content

Commit 9295c5e

Browse files
committed
ci: Bump FCOS config commit to F43
The previous pinned commit (0661e4ed) targets Fedora 42 whose repos have been decommissioned and now return 404, breaking compose tests. Update to 93218582 which targets Fedora 43. Also fix issues exposed by the fedora-bootc submodule update which no longer provides the full OS package set or treefile keys: - Add rpm-ostree and kernel to the compose test package set - Inject treefile keys needed by compose tests (boot-location, tmp-is-dir, machineid-compat, rpmdb, opt-usrlocal, etc.) - Use setdefault() for add-commit-metadata in test-basic-unified.sh These were previously provided by the fedora-bootc submodule tier manifests which have been stripped down for the bootc-native build flow.
1 parent d97c7a2 commit 9295c5e

4 files changed

Lines changed: 28 additions & 8 deletions

File tree

tests/compose.sh

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -euo pipefail
33

44
# freeze on a specific commit for tests for reproducibility and since it should
55
# always work to target older treefiles
6-
FEDORA_COREOS_CONFIG_COMMIT=0661e4edc55d4f5293ba463c9dec0471b84d05d4
6+
FEDORA_COREOS_CONFIG_COMMIT=932185829a451812a6f627f7937f49fe3bf952be
77

88
dn=$(cd "$(dirname "$0")" && pwd)
99
topsrcdir=$(cd "$dn/.." && pwd)
@@ -50,13 +50,32 @@ if [ ! -d compose-cache ]; then
5050
# default; we'll want it to test `install-langs`. This also means that we have
5151
# to add updates-archive to the repo list.
5252
# Also neuter OSTree layers; we don't re-implement cosa's auto-layering sugar
53-
curl -Lf --retry 3 -O https://src.fedoraproject.org/rpms/fedora-repos/raw/f44/f/fedora-updates-archive.repo
53+
curl -Lf --retry 3 -O https://src.fedoraproject.org/rpms/fedora-repos/raw/f43/f/fedora-updates-archive.repo
5454
python3 -c '
5555
import sys, json
5656
y = json.load(sys.stdin)
5757
y["repos"] += ["updates-archive"]
58-
y["packages"] += ["glibc-all-langpacks"]
58+
y["packages"] += ["glibc-all-langpacks", "rpm-ostree"]
5959
y["ostree-layers"] = []
60+
# The fedora-bootc submodule no longer provides these treefile keys
61+
# that are needed by compose tests. Inject them as test infrastructure.
62+
y.setdefault("packages", [])
63+
if "kernel" not in y["packages"]:
64+
y["packages"] += ["kernel"]
65+
y.setdefault("ref", "fedora/x86_64/coreos/testing-devel")
66+
y.setdefault("boot-location", "modules")
67+
y.setdefault("tmp-is-dir", True)
68+
y.setdefault("machineid-compat", False)
69+
y.setdefault("default-target", "multi-user.target")
70+
y.setdefault("rpmdb", "sqlite")
71+
y.setdefault("opt-usrlocal", "var")
72+
y.setdefault("add-commit-metadata", {})
73+
y.setdefault("check-passwd", {"type": "none"})
74+
y.setdefault("check-groups", {"type": "none"})
75+
y.setdefault("automatic-version-prefix", "43.<date:%Y%m%d>.dev")
76+
y.setdefault("mutate-os-release", "43")
77+
if "exclude-packages" not in y:
78+
y["exclude-packages"] = ["kernel-debug-core"]
6079
json.dump(y, sys.stdout)' < manifest.json > manifest.json.new
6180
mv manifest.json{.new,}
6281
popd # config

tests/compose/libbasic-test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ ostree --repo=${repo} ls ${treeref} /usr/etc/passwd > passwd.txt
2323
assert_file_has_content_literal passwd.txt '00644 '
2424

2525
ostree --repo=${repo} ls ${treeref} /usr/etc/shadow > shadow.txt
26-
assert_file_has_content_literal shadow.txt '00000 '
26+
# shadow-utils >= 4.17 uses mode 0400; older versions use 0000
27+
assert_file_has_content shadow.txt '00[04]00 '
2728
ostree --repo=${repo} ls ${treeref} /usr/etc/gshadow > gshadow.txt
28-
assert_file_has_content_literal gshadow.txt '00000 '
29+
assert_file_has_content gshadow.txt '00[04]00 '
2930

3031
ostree --repo=${repo} cat ${treeref} /usr/etc/default/useradd > useradd.txt
3132
assert_file_has_content_literal useradd.txt HOME=/var/home

tests/compose/test-basic-unified.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ treefile_pyedit "del tf['base-refspec']"
7575
echo "ok cannot use derivation for composes yet"
7676

7777

78-
treefile_pyedit "tf['add-commit-metadata']['foobar'] = 'bazboo'"
79-
treefile_pyedit "tf['add-commit-metadata']['overrideme'] = 'old var'"
78+
treefile_pyedit "tf.setdefault('add-commit-metadata', {})['foobar'] = 'bazboo'"
79+
treefile_pyedit "tf.setdefault('add-commit-metadata', {})['overrideme'] = 'old var'"
8080

8181
# Test metadata json with objects, arrays, numbers
8282
cat > metadata.json <<EOF

tests/compose/test-installroot.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dn=$(cd "$(dirname "$0")" && pwd)
66
. "${dn}/libcomposetest.sh"
77

88
# This is used to test postprocessing with treefile vs not
9-
treefile_set "boot-location" '"new"'
9+
treefile_set "boot-location" '"modules"'
1010
# On by default now:
1111
# treefile_set "ignore-devices" 'True'
1212

0 commit comments

Comments
 (0)