tests: Make two more tests compatible with deployment staging

Unlike the kernel args one, these two were simple.

Closes: #1458
Approved by: jlebon

tests/vmcheck/test-initramfs.sh

@@ -105,12 +105,13 @@ for file in first second; do
     vm_cmd lsinitrd $initramfs > lsinitrd.txt
     assert_file_has_content lsinitrd.txt /etc/rpmostree-initramfs-testing-${file}
 done
+echo "ok initramfs args enable"
 
 vm_rpmostree initramfs --disable
-
+vm_reboot
 initramfs=$(vm_cmd grep ^initrd /boot/loader/entries/ostree-2-$osname.conf | sed -e 's,initrd ,/boot/,')
 test -n "${initramfs}"
 vm_cmd lsinitrd $initramfs > lsinitrd.txt
 assert_not_file_has_content lsinitrd.txt /etc/rpmostree-initramfs-testing
 
-echo "ok initramfs args"
+echo "ok initramfs disable"

tests/vmcheck/test-layering-scripts.sh

@@ -124,9 +124,9 @@ vm_cmd cat /usr/share/rpmostree-lua-override-test-expand > lua-override-expand.t
 diff -u install-langs.txt lua-override-expand.txt
 echo "ok script override"
 
-vm_rpmostree rollback
+vm_rpmostree ex reset
 vm_reboot
-vm_rpmostree cleanup -p
+vm_rpmostree cleanup -pr
 # File triggers are Fedora+
 if ! vm_cmd grep -q 'ID=.*centos' /etc/os-release; then
 # We use /usr/share/licenses since it's small predictable content