Skip to content

Commit d9d64d7

Browse files
examples: add 'rhel9' and 'rawhide' bls examples
Add two new OS images to CI: - `rhel9`: to test that feature flag `rhel9` is working correctly - `rawhide`: with a 6.15 pre-release kernel, requiring no features This helps round out the verification that our new mount code behaves correctly in all of the situations that it claims to. Signed-off-by: Allison Karlitskaya <allison.karlitskaya@redhat.com>
1 parent 6f3de92 commit d9d64d7

File tree

4 files changed

+41
-0
lines changed

4 files changed

+41
-0
lines changed

.github/workflows/examples.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
example:
1919
- { dir: 'bls', os: 'arch' }
2020
- { dir: 'bls', os: 'fedora' }
21+
- { dir: 'bls', os: 'rawhide' }
22+
- { dir: 'bls', os: 'rhel9' }
2123
- { dir: 'bls', os: 'ubuntu' }
2224
- { dir: 'uki', os: 'arch' }
2325
- { dir: 'uki', os: 'fedora' }

examples/bls/Containerfile.rawhide

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM fedora:rawhide
2+
COPY extra /
3+
COPY cfsctl /usr/bin
4+
RUN --mount=type=cache,target=/var/cache/libdnf5 <<EOF
5+
set -eux
6+
dnf --setopt keepcache=1 install --allowerasing -y systemd util-linux skopeo composefs strace dosfstools kernel openssh-server
7+
systemctl enable systemd-networkd
8+
passwd -d root
9+
mkdir /sysroot
10+
mkdir /composefs-meta
11+
mv /boot /composefs-meta
12+
mkdir /boot
13+
EOF
14+
RUN true # hack to get an extra layer

examples/bls/Containerfile.rhel9

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# FROM docker.io/redhat/ubi9 missing: dosfstools, kernel
2+
FROM quay.io/centos/centos:9
3+
COPY extra /
4+
COPY cfsctl /usr/bin
5+
RUN --mount=type=cache,target=/var/cache/dnf <<EOF
6+
set -eux
7+
mkdir -p /etc/kernel
8+
touch /etc/kernel/cmdline
9+
echo layout=bls | tee /etc/kernel/install.conf
10+
dnf --setopt keepcache=1 install --allowerasing -y \
11+
systemd util-linux skopeo composefs strace dosfstools kernel openssh-server passwd NetworkManager
12+
systemctl enable tmp.mount
13+
passwd -d root
14+
mkdir /sysroot
15+
mkdir /composefs-meta
16+
mv /boot /composefs-meta
17+
mkdir /boot
18+
EOF
19+
RUN true # hack to get an extra layer

examples/bls/build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,17 @@ case "${os}" in
1616
containerfile='Containerfile.arch'
1717
features='--features=pre-6.15'
1818
;;
19+
rhel9)
20+
containerfile='Containerfile.rhel9'
21+
features='--features=rhel9'
1922
;;
2023
ubuntu)
2124
containerfile='Containerfile.ubuntu'
2225
features='--features=pre-6.15'
2326
;;
27+
rawhide)
28+
containerfile='Containerfile.rawhide'
29+
features='--no-default-features'
2430
;;
2531
*)
2632
echo "*** unknown variant ${os}"

0 commit comments

Comments
 (0)