Skip to content

Commit

Permalink
tests/container-image: Revert use of automatic upgrade trigger
Browse files Browse the repository at this point in the history
This no longer works since
ostreedev/ostree-rs-ext@f450812

Which is actually a good thing.

I'll look at readding this test in another place.
  • Loading branch information
cgwalters committed May 23, 2023
1 parent 0f03641 commit ebb10e6
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions tests/kolainst/destructive/container-image
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,9 @@ EOF

# Now revert back to the base image, but keep our layered package foo
rm "${image_dir}" -rf
timeout 5m skopeo copy containers-storage:localhost/fcos ${image}:derived
/tmp/autopkgtest-reboot-prepare 4
cursor=$(journalctl -o json -n 1 | jq -r '.["__CURSOR"]')
systemctl start --no-block rpm-ostreed-automatic.service
echo "Blocking for reboot initiation"
journalctl --after-cursor="$cursor" -f -u rpm-ostreed
skopeo copy containers-storage:localhost/fcos ${image}:latest
rpm-ostree rebase ostree-unverified-image:${image}:latest
/tmp/autopkgtest-reboot 4
;;
4)
# This should carry over
Expand All @@ -207,7 +204,7 @@ EOF
fatal "found $p"
fi
done
rpmostree_assert_status ".deployments[0][\"container-image-reference\"] == \"ostree-unverified-image:oci:$image_dir:derived\""
rpmostree_assert_status ".deployments[0][\"container-image-reference\"] == \"ostree-unverified-image:oci:$image_dir:latest\""
;;
*) echo "unexpected mark: ${AUTOPKGTEST_REBOOT_MARK}"; exit 1;;
esac

0 comments on commit ebb10e6

Please sign in to comment.