packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2584 from cgwalters/fix-ci 

ci: Mask zincati for synthetic update
This commit is contained in:
Dan Nicholson 2022-04-20 19:03:16 -06:00 committed by GitHub
parent d75b934c59 b92dbc49f0
commit 8491a12102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)