Merge pull request #1426 from cgwalters/test-reboot

Add a test case for our internal reboot command

Author: cgwalters

.github/workflows/ci.yml

@@ -56,7 +56,7 @@ jobs:
         run: sudo apt update && sudo apt install just
       - uses: actions/checkout@v4
       - name: Build and run container integration tests
-        run: sudo just run-container-integration
+        run: sudo just run-container-integration run-container-external-tests
   cargo-deny:
     runs-on: ubuntu-latest
     steps:

Justfile

@@ -10,5 +10,9 @@ build-integration-test-image *ARGS: build
 run-container-integration: build-integration-test-image
     podman run --rm localhost/bootc-integration bootc-integration-tests container
 
+# These tests may spawn their own container images.
+run-container-external-tests:
+   ./tests/container/run localhost/bootc
+
 unittest *ARGS:
     podman build --jobs=4 --target units -t localhost/bootc-units --build-arg=unitargs={{ARGS}} .

crates/lib/src/cli.rs

@@ -472,6 +472,9 @@ pub(crate) enum InternalsOpts {
         // The stateroot
         stateroot: String,
     },
+    /// Initiate a reboot the same way we would after --apply; intended
+    /// primarily for testing.
+    Reboot,
     #[cfg(feature = "rhsm")]
     /// Publish subscription-manager facts to /etc/rhsm/facts/bootc.facts
     PublishRhsmFacts,
@@ -1230,6 +1233,7 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                     Ok(())
                 }
             },
+            InternalsOpts::Reboot => crate::reboot::reboot(),
             InternalsOpts::Fsck => {
                 let sysroot = &get_storage().await?;
                 crate::fsck::fsck(&sysroot, std::io::stdout().lock()).await?;

tests/container/reboot/bootc-finish-test-reboot.service

@@ -0,0 +1,11 @@
+[Unit]
+ConditionPathExists=!/etc/initrd-release 
+After=local-fs.target
+RequiresMountsFor=/run/bootc-test-reboot
+Before=bootc-test-reboot.service
+PartOf=bootc-test-reboot.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStop=touch /run/bootc-test-reboot/success

tests/container/reboot/bootc-test-reboot.service

@@ -0,0 +1,12 @@
+[Unit]
+ConditionPathExists=!/etc/initrd-release 
+Requires=bootc-finish-test-reboot.service
+After=bootc-finish-test-reboot.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=bootc internals reboot
+
+[Install]
+WantedBy=multi-user.target

tests/container/reboot/run

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Verify that invoking `bootc internals reboot` actually invokes a reboot, when
+# running inside systemd.
+# xref:
+# - https://github.com/bootc-dev/bootc/issues/1416
+# - https://github.com/bootc-dev/bootc/issues/1419
+set -euo pipefail
+image=$1
+tmpd=$(mktemp -d)
+log() {
+  echo "$@"
+  "$@"
+}
+log timeout 120 podman run --rm --systemd=always --privileged -v /sys:/sys:ro --label bootc.test=reboot --net=none -v $(pwd):/src:ro -v $tmpd:/run/bootc-test-reboot $image /bin/sh -c 'cp /src/*.service /etc/systemd/system && systemctl enable bootc-test-reboot && exec /sbin/init' || true
+ls -al $tmpd
+if test '!' -f $tmpd/success; then
+  echo "reboot failed" 1>&2
+  rm -rf "$tmpd"
+  exit 1
+fi
+rm -rf "$tmpd"
+echo "ok reboot"

tests/container/run

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -euo pipefail
+image=$1
+shift
+
+cd $(dirname $0)
+
+tests=$(find . -maxdepth 1 -type d)
+for case in $tests; do
+  if test $case = .; then continue; fi
+  echo "Running: $case"
+  cd $case
+  ./run $image
+  cd -
+  echo "ok $case"
+done