From d9a439b508a9c2c447c01c3db55a53d47e739ea9 Mon Sep 17 00:00:00 2001
From: Micah Abbott <miabbott@redhat.com>
Date: Mon, 2 Oct 2017 16:14:39 +0000
Subject: [PATCH] tests: handle package layering on CentOS

In #254, it is noted that the package layering of `httpd` isn't
working on CentOS because the `centos-logos` dependency is trying to
layer files on `/boot`.  Until CentOS gets a version of `rpm-ostree`
that supports layering on `/boot` (see projectatomic/rpm-ostree#969),
we need to use a different package to test package layering in CentOS.

This change brings in a conditional installation of `ntp` in the
CentOS case, until we have a newer version of `rpm-ostree` to use.
---
 tests/improved-sanity-test/main.yml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/tests/improved-sanity-test/main.yml b/tests/improved-sanity-test/main.yml
index 94d8a1a..0c8b98b 100644
--- a/tests/improved-sanity-test/main.yml
+++ b/tests/improved-sanity-test/main.yml
@@ -481,9 +481,17 @@
     - role: rpm_ostree_install
       packages: httpd
       reboot: false
+      when: ansible_distribution != 'CentOS'
       tags:
         - rpm_ostree_install
 
+    - role: rpm_ostree_install
+      packages: ntp
+      reboot: false
+      when: ansible_distribution == 'CentOS'
+      tags:
+        - rpm_ostree_install_centos
+
     - role: reboot
       tags:
         - reboot_post_up_install
@@ -495,18 +503,27 @@
 
     - role: rpm_ostree_install_verify
       package: httpd
+      when: ansible_distribution != 'CentOS'
       tags:
         - rpm_ostree_install_verify
-      check_mode: no
+
+    - role: rpm_ostree_install_verify
+      package: ntp
+      binary: ntpd
+      when: ansible_distribution == 'CentOS'
+      tags:
+        - rpm_ostree_install_verify_centos
 
     - role: httpd_start
       httpd_port: 8080
+      when: ansible_distribution != 'CentOS'
       tags:
         - httpd_start
 
     - role: url_verify
       url: http://localhost:8080
       destination: /dev/null
+      when: ansible_distribution != 'CentOS'
       tags:
         - url_verify
 
@@ -687,7 +704,13 @@
     - role: rpm_ostree_uninstall_verify
       package: httpd
       tags:
-        - rpm_ostree_uninstall_verify
+        - rpm_ostree_uninstall_verify_httpd
+
+    - role: rpm_ostree_uninstall_verify
+      package: ntp
+      binary: ntpd
+      tags:
+        - rpm_ostree_uninstall_verify_ntp
 
     # Check admin unlock overlayfs missing
     - role: overlayfs_verify_missing