From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 15 Aug 2022 21:50:11 +0000 (-0400)
Subject: tests/kolainst/staged-deploy: parse `rpm-ostree status --json` instead
X-Git-Tag: archive/raspbian/2022.6-1+rpi1^2~7^2^2~27^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=84670a007061196249cde89e31b36b5b37478e61;p=ostree.git

tests/kolainst/staged-deploy: parse `rpm-ostree status --json` instead

Don't parse `rpm-ostree status` output, it's not meant for that. Use
`--json` output instead.

While we're here, fix an obsolete reference to Ansible.

Related: https://github.com/coreos/rpm-ostree/pull/3938
---

diff --git a/tests/kolainst/destructive/staged-deploy.sh b/tests/kolainst/destructive/staged-deploy.sh
index af31078a..c923605f 100755
--- a/tests/kolainst/destructive/staged-deploy.sh
+++ b/tests/kolainst/destructive/staged-deploy.sh
@@ -100,8 +100,7 @@ EOF
     newcommit=$(ostree rev-parse staged-deploy)
     ostree admin upgrade --stage >out.txt
     test -f /run/ostree/staged-deployment
-    # Debating bouncing back out to Ansible for this
-    firstdeploycommit=$(rpm-ostree status |grep 'Commit:' |head -1|sed -e 's,^ *Commit: *,,')
+    firstdeploycommit=$(rpm-ostree status --json | jq -r .deployments[0].checksum)
     assert_streq "${firstdeploycommit}" "${newcommit}"
     # Cleanup
     rpm-ostree cleanup -rp