Skip to content

Commit

Permalink
kola/kernel-replace: Add OS_ID recogntion
Browse files Browse the repository at this point in the history
  • Loading branch information
c4rt0 committed Jul 5, 2024
1 parent dfb0b16 commit 18d9d86
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions tests/kola/rpm-ostree/kernel-replace
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
## # We've seen some OOM when 1024M is used:
## # https://github.com/coreos/fedora-coreos-tracker/issues/1506
## minMemory: 2048
## # This test only runs on FCOS due to a problem with skopeo copy on
## # RHCOS. See: https://github.com/containers/skopeo/issues/1846
## distros: fcos
## distros: "fcos rhcos scos"
## # Needs internet access as we fetch files from koji
## # We add the "reprovision" tag here even though we aren't
## # reprovisioning as a hack so that in our pipeline the test
Expand Down Expand Up @@ -43,10 +41,14 @@ set -euxo pipefail
cd $(mktemp -d)

# TODO: It'd be much better to test this via a registry
image_dir=/var/tmp/fcos
image=oci:$image_dir

# search for a line starting with ID, assign second field after delimiter
OS_ID=$(grep '^ID=' /etc/os-release | cut -d "=" -f2 | cut -d '"' -f2)

image_dir=/var/tmp/coreos
image=oci:${image_dir}
image_pull=ostree-unverified-image:$image
tmp_imagedir=/var/tmp/fcos-tmp
tmp_imagedir=${image_dir}-tmp
arch=$(arch)
kver="6.2.9-300.fc38.${arch}"

Expand Down Expand Up @@ -80,13 +82,13 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
1)
# Setup
# copy the OCI dir to containers-storage for a local build
skopeo copy $image containers-storage:localhost/fcos
skopeo copy $image containers-storage:localhost/${OS_ID}
rm "${image_dir}" -rf
td=$(mktemp -d)
cd ${td}
version=$(rpm-ostree --version | grep Version)
cat > Dockerfile << EOF
FROM localhost/fcos
cat > Containerfile << EOF
FROM localhost/${OS_ID}
RUN rpm-ostree cliwrap install-to-root /
RUN rpm-ostree override replace \
https://koji.fedoraproject.org/koji/buildinfo?buildID=2178613 && \
Expand All @@ -101,12 +103,12 @@ EOF
3.*) touched_resolv_conf=1; touch /etc/resolv.conf;;
esac
fi
podman build --net=host -t localhost/fcos-derived --squash .
podman build --net=host -t localhost/${OS_ID}-derived --squash .
if test "${touched_resolv_conf}" -eq 1; then
rm -vf /etc/resolv.conf
fi
derived=oci:$image_dir:derived
skopeo copy containers-storage:localhost/fcos-derived $derived
skopeo copy containers-storage:localhost/${OS_ID}-derived $derived
rpm-ostree --version
rpm-ostree rebase ostree-unverified-image:$derived
ostree container image list --repo=/ostree/repo
Expand Down

0 comments on commit 18d9d86

Please sign in to comment.