diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c4d949f..c3351400 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,12 +107,12 @@ jobs: with: name: bootc.tar.zst - name: Install - run: tar -xvf bootc.tar.zst - - name: Update host skopeo - run: | - echo 'deb http://cz.archive.ubuntu.com/ubuntu lunar main universe' | sudo tee -a /etc/apt/sources.list - sudo apt update - sudo apt upgrade skopeo + run: tar -xvf bootc.tar.zst && sha256sum usr/bin/bootc > bootc.sha256sum + #- name: Update host skopeo + # run: | + # echo 'deb http://cz.archive.ubuntu.com/ubuntu lunar main universe' | sudo tee -a /etc/apt/sources.list + # sudo apt update + # sudo apt upgrade skopeo - name: Build derived image run: | mkdir -p usr/lib/bootc/install @@ -122,15 +122,16 @@ jobs: EOF cat >Containerfile << 'EOF' FROM quay.io/centos-boot/fedora-tier-1:eln - COPY usr usr/ + COPY usr usr EOF sudo podman build -t localhost/testimage . - sudo podman run --rm -ti localhost/testimage ls -al /usr/lib/bootc/install + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: Integration tests run: | set -xeuo pipefail - sudo podman run --rm -ti --privileged -v /:/target -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \ - localhost/testimage env RUST_LOG=error,bootc_lib::install=debug bootc install-to-filesystem --skip-fetch-check --target-no-signature-verification \ + sudo podman run --rm -ti --privileged -v /:/target --pid=host --security-opt label=disable \ + localhost/testimage env RUST_LOG=error,bootc_lib::install=debug bootc install-to-filesystem --skip-fetch-check --target-no-signature-verification \ --karg=foo=bar --disable-selinux --replace=alongside /target sudo grep foo=bar /boot/loader/entries/*.conf sudo grep localtestkarg=somevalue /boot/loader/entries/*.conf diff --git a/lib/src/install.rs b/lib/src/install.rs index 367b0432..ccb6812a 100644 --- a/lib/src/install.rs +++ b/lib/src/install.rs @@ -426,9 +426,12 @@ pub(crate) mod config { if let Some(install) = c.install { tracing::debug!("Merging install config: {install:?}"); config.merge(install); + } else { + tracing::debug!("Config missing install: {path:?}"); } } else { config = c.install; + tracing::debug!("Using initial config: {config:?}"); } } config.ok_or_else(|| anyhow::anyhow!("No bootc/install config found; this operating system must define a default configuration to be installable"))