From 61ba4e7e5ae257b0278e5be2ac0e0af7e3049418 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 4 Jul 2018 11:57:50 -0400 Subject: [PATCH] tests/installed: Add var-mount.yml destructive test Closes: #1668 Approved by: cgwalters --- tests/installed/destructive-ansible.yml | 1 + tests/installed/destructive/var-mount.yml | 13 +++++++++++++ tests/installed/tasks/install-git.yml | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 tests/installed/destructive/var-mount.yml diff --git a/tests/installed/destructive-ansible.yml b/tests/installed/destructive-ansible.yml index c72f6b82..50c8fd77 100644 --- a/tests/installed/destructive-ansible.yml +++ b/tests/installed/destructive-ansible.yml @@ -13,3 +13,4 @@ when: use_git_build - import_tasks: tasks/query-host.yml - import_tasks: destructive/staged-deploy.yml + - import_tasks: destructive/var-mount.yml diff --git a/tests/installed/destructive/var-mount.yml b/tests/installed/destructive/var-mount.yml new file mode 100644 index 00000000..3fe041af --- /dev/null +++ b/tests/installed/destructive/var-mount.yml @@ -0,0 +1,13 @@ +# https://github.com/ostreedev/ostree/issues/1667 +- name: Set up /var as a mountpoint + shell: | + set -xeuo pipefail + cp -a /var /sysroot/myvar + touch /sysroot/myvar/somenewfile + echo '/sysroot/myvar /var none bind 0 0' >> /etc/fstab +- include_tasks: ../tasks/reboot.yml +- name: Check that /var mountpoint worked + shell: | + set -xeuo pipefail + systemctl status var.mount + test -f /var/somenewfile diff --git a/tests/installed/tasks/install-git.yml b/tests/installed/tasks/install-git.yml index 8216afeb..3374cce7 100644 --- a/tests/installed/tasks/install-git.yml +++ b/tests/installed/tasks/install-git.yml @@ -8,6 +8,9 @@ synchronize: src=build/x86_64/ dest=/root/x86_64/ archive=yes - name: Install RPMs shell: rpm-ostree override replace /root/x86_64/*.rpm +# Regenerate to make sure new ostree binaries also make it to the initrd +- name: Regenerate initramfs + shell: rpm-ostree initramfs --enable - import_tasks: ../tasks/reboot.yml - import_tasks: ../tasks/query-host.yml - command: ostree --version