shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

ci: Mask zincati for synthetic update

Browse Source 
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
This commit is contained in:
Colin Walters 2022-04-20 20:23:10 -04:00
parent d75b934c59
commit b92dbc49f0
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/kolainst/destructive/staged-deploy.sh
View File

@ -40,6 +40,9 @@ EOF
cd /ostree/repo/tmp cd /ostree/repo/tmp
# https://github.com/ostreedev/ostree/issues/1569 # https://github.com/ostreedev/ostree/issues/1569
ostree checkout -H ${commit} t 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 ostree commit --no-bindings --parent="${commit}" -b staged-deploy -I --consume t
newcommit=$(ostree rev-parse staged-deploy) newcommit=$(ostree rev-parse staged-deploy)
orig_mtime=$(stat -c '%.Y' /sysroot/ostree/deploy) orig_mtime=$(stat -c '%.Y' /sysroot/ostree/deploy)