From b92dbc49f0736a734a5f4550cf7b784263d0eef9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 20 Apr 2022 20:23:10 -0400 Subject: [PATCH] ci: Mask zincati for synthetic update 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/kolainst/destructive/staged-deploy.sh b/tests/kolainst/destructive/staged-deploy.sh index 406911ca..df40f115 100755 --- a/tests/kolainst/destructive/staged-deploy.sh +++ b/tests/kolainst/destructive/staged-deploy.sh @@ -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)