From d81ffc2e2813d5505e77b4329f1ad4cad808ca87 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 31 Oct 2019 09:45:50 +0000
Subject: [PATCH] Revert to yatesr.timezone role

In the 1.2.0 release the offending symlinks were removed from the role.

Also skip molecule tests from galaxy roles.

TrivialFix

Change-Id: I233e5468054e950a80355bdc2205bd6070a12297
---
 ansible/ntp.yml                   | 2 +-
 kayobe/ansible.py                 | 2 +-
 kayobe/tests/unit/test_ansible.py | 2 +-
 requirements.yml                  | 6 +-----
 tools/test-molecule.sh            | 6 ++++++
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ansible/ntp.yml b/ansible/ntp.yml
index 60e849225..9160d990c 100644
--- a/ansible/ntp.yml
+++ b/ansible/ntp.yml
@@ -4,7 +4,7 @@
   tags:
     - ntp
   roles:
-    - role: stackhpc.timezone
+    - role: yatesr.timezone
       become: True
     - role: resmo.ntp
       become: True
diff --git a/kayobe/ansible.py b/kayobe/ansible.py
index 009c72c56..56d1e57f0 100644
--- a/kayobe/ansible.py
+++ b/kayobe/ansible.py
@@ -273,7 +273,7 @@ def prune_galaxy_roles(parsed_args):
         'stackhpc.os-flavors',
         'stackhpc.os-projects',
         'stackhpc.parted-1-1',
-        'yatesr.timezone',
+        'stackhpc.timezone',
     ]
     LOG.debug("Removing roles: %s", ",".join(roles_to_remove))
     utils.galaxy_remove(roles_to_remove, "ansible/roles")
diff --git a/kayobe/tests/unit/test_ansible.py b/kayobe/tests/unit/test_ansible.py
index 86361f474..72ce3c549 100644
--- a/kayobe/tests/unit/test_ansible.py
+++ b/kayobe/tests/unit/test_ansible.py
@@ -441,7 +441,7 @@ class TestCase(unittest.TestCase):
             'stackhpc.os-flavors',
             'stackhpc.os-projects',
             'stackhpc.parted-1-1',
-            'yatesr.timezone',
+            'stackhpc.timezone',
         ]
         mock_remove.assert_called_once_with(expected_roles,
                                             "ansible/roles")
diff --git a/requirements.yml b/requirements.yml
index fc75de49f..3462069ee 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -39,9 +39,5 @@
   version: v1.3.0
 - src: stackhpc.os-shade
   version: v1.3.0
-# We are currently using a fork of this role since the upstream yatesr.timezone
-# role includes symlinks which do not play nicely with PBR. Once that issue has
-# been resolved in PBR, we can revert to using the upstream yatesr.timezone
-# role.
-- src: stackhpc.timezone
+- src: yatesr.timezone
   version: 1.2.0
diff --git a/tools/test-molecule.sh b/tools/test-molecule.sh
index 77923f661..41b9f8a77 100755
--- a/tools/test-molecule.sh
+++ b/tools/test-molecule.sh
@@ -11,6 +11,12 @@ failed=0
 ran=0
 for molecule in $molecules; do
     pushd $(dirname $molecule)
+    # Don't run molecule tests from Galaxy roles.
+    if [[ -f meta/.galaxy_install_info ]]; then
+        echo "Skipping $(basename $(pwd)) as it is a Galaxy role"
+        popd
+        continue
+    fi
     if ! molecule test --all $*; then
         failed=$((failed + 1))
     fi