From 510d10c0714046743d149f11db1d722c1a19815b Mon Sep 17 00:00:00 2001
From: Rafael Fonseca <r4f4rfs@gmail.com>
Date: Fri, 22 Nov 2019 23:14:13 +0100
Subject: [PATCH] fixup! tests/staged-deploy: test --keep-previous option

--keep-previous-version
---
 tests/installed/destructive/staged-deploy.yml | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/installed/destructive/staged-deploy.yml b/tests/installed/destructive/staged-deploy.yml
index f96909382e..abdb6bfb0f 100644
--- a/tests/installed/destructive/staged-deploy.yml
+++ b/tests/installed/destructive/staged-deploy.yml
@@ -116,19 +116,25 @@
 - name: Previous version is retained during staged
   shell: |
     set -xeuo pipefail
-    ostree --repo=/ostree/repo rfs --create nonstaged-deploy "${commit}"
+    ostree --repo=/ostree/repo refs --create nonstaged-deploy "${commit}"
     ostree admin deploy nonstaged-deploy
-    ostree admin status > status.txt
-    grep -vqFe '(staged)' status.txt
-    ostree admin deploy --stage --retain-previous staged-deploy
+    ostree admin deploy --stage --retain-previous-version staged-deploy
     test -f /run/ostree/staged-deployment
     ostree admin status > status.txt
     grep -qFe '(staged)' status.txt
-    test $(grep -Fce 'Version: ' status.txt) == 2
-    ostree admin undeploy 0
-    ostree admin undeploy 1
   environment:
     commit: "{{ rpmostree_status['deployments'][0]['checksum'] }}"
+- include_tasks: ../tasks/reboot.yml
+- name: Check that previous version was kept
+  shell: |
+    set -xeuo pipefail
+    rpm-ostree status
+    # Assert that the previous boot had a journal entry for it
+    journalctl -b "-1" -u ostree-finalize-staged.service | grep -q -e 'Transaction complete'
+    # And there should not be a staged deployment
+    test '!' -f /run/ostree/staged-deployment
+    ostree admin status > status.txt
+    test $(grep -Fce 'Version: ' status.txt) == 1
 
 - name: Cleanup refs
   shell: ostree refs --delete staged-deploy nonstaged-deploy