ci: Mask zincati for synthetic update
authorColin Walters <walters@verbum.org>
Thu, 21 Apr 2022 00:23:10 +0000 (20:23 -0400)
committerColin Walters <walters@verbum.org>
Thu, 21 Apr 2022 00:23:10 +0000 (20:23 -0400)
Our CI started falling over because coreos-assembler checks
for units stuck activating as of https://github.com/coreos/coreos-assembler/pull/2810

Really need to centralize the code for this and fix the root
problem, but...not today.

xref https://github.com/coreos/coreos-assembler/pull/2814

tests/kolainst/destructive/staged-deploy.sh

index 406911ca6e84b6c6e354c233ea74dfcfd1678051..df40f115b0e54f8d04b8c0f8ea41c4c1e6adeec5 100755 (executable)
@@ -40,6 +40,9 @@ EOF
     cd /ostree/repo/tmp
     # https://github.com/ostreedev/ostree/issues/1569
     ostree checkout -H ${commit} t
+    # xref https://github.com/coreos/coreos-assembler/pull/2814
+    systemctl mask --now zincati
+    # Create a synthetic commit for upgrade
     ostree commit --no-bindings --parent="${commit}" -b staged-deploy -I --consume t
     newcommit=$(ostree rev-parse staged-deploy)
     orig_mtime=$(stat -c '%.Y' /sysroot/ostree/deploy)