From 14807039427bf5988806983a12a5f4cb06667465 Mon Sep 17 00:00:00 2001
From: Andrew Bonney <andrew.bonney@bbc.co.uk>
Date: Fri, 28 Oct 2022 14:28:03 +0100
Subject: [PATCH] Fix role installation in tests

Previous collection addition commit assumed multiple yaml files
could be passed in at once.

Change-Id: Ia23f1102e76f57d20af755bd0fb26018c1cf632a
---
 elk_metrics_7x/tests/functional.yml | 22 ++++++++++++++++++----
 elk_metrics_7x/tests/run-tests.sh   |  5 ++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/elk_metrics_7x/tests/functional.yml b/elk_metrics_7x/tests/functional.yml
index 902b6ecd..730bef83 100644
--- a/elk_metrics_7x/tests/functional.yml
+++ b/elk_metrics_7x/tests/functional.yml
@@ -98,17 +98,31 @@
       args:
         chdir: "src/{{ current_test_repo }}/elk_metrics_7x"
 
-    - name: Run ansible-galaxy (tests)
+    - name: Run ansible-galaxy (tests roles)
       become: yes
       become_user: root
-      command: "${HOME}/ansible_venv/bin/ansible-galaxy install --force --ignore-errors --roles-path=${HOME}/ansible_venv/repositories/roles -r ansible-role-requirements.yml -r ansible-collection-requirements.yml"
+      command: "${HOME}/ansible_venv/bin/ansible-galaxy install --force --ignore-errors --roles-path=${HOME}/ansible_venv/repositories/roles -r ansible-role-requirements.yml"
       args:
         chdir: "src/{{ current_test_repo }}/elk_metrics_7x/tests"
 
-    - name: Run ansible-galaxy (elk_metrics_7x)
+    - name: Run ansible-galaxy (tests collections)
       become: yes
       become_user: root
-      command: "${HOME}/ansible_venv/bin/ansible-galaxy install --force --ignore-errors --roles-path=${HOME}/ansible_venv/repositories/roles -r ansible-role-requirements.yml -r ansible-collection-requirements.yml"
+      command: "${HOME}/ansible_venv/bin/ansible-galaxy install --force --ignore-errors --roles-path=${HOME}/ansible_venv/repositories/roles -r ansible-collection-requirements.yml"
+      args:
+        chdir: "src/{{ current_test_repo }}/elk_metrics_7x/tests"
+
+    - name: Run ansible-galaxy (elk_metrics_7x roles)
+      become: yes
+      become_user: root
+      command: "${HOME}/ansible_venv/bin/ansible-galaxy install --force --ignore-errors --roles-path=${HOME}/ansible_venv/repositories/roles -r ansible-role-requirements.yml"
+      args:
+        chdir: "src/{{ current_test_repo }}/elk_metrics_7x"
+
+    - name: Run ansible-galaxy (elk_metrics_7x collections)
+      become: yes
+      become_user: root
+      command: "${HOME}/ansible_venv/bin/ansible-galaxy install --force --ignore-errors --roles-path=${HOME}/ansible_venv/repositories/roles -r ansible-collection-requirements.yml"
       args:
         chdir: "src/{{ current_test_repo }}/elk_metrics_7x"
 
diff --git a/elk_metrics_7x/tests/run-tests.sh b/elk_metrics_7x/tests/run-tests.sh
index 0ceda979..d3441503 100755
--- a/elk_metrics_7x/tests/run-tests.sh
+++ b/elk_metrics_7x/tests/run-tests.sh
@@ -33,7 +33,10 @@ deactivate
 
 ${HOME}/ansible_venv/bin/ansible-galaxy install --force \
                                              --roles-path="${HOME}/ansible_venv/repositories/roles" \
-                                             --role-file="${TEST_DIR}/elk_metrics_7x/tests/ansible-role-requirements.yml" \
+                                             -r "${TEST_DIR}/elk_metrics_7x/tests/ansible-role-requirements.yml"
+
+${HOME}/ansible_venv/bin/ansible-galaxy install --force \
+                                             --roles-path="${HOME}/ansible_venv/repositories/roles" \
                                              -r "${TEST_DIR}/elk_metrics_7x/tests/ansible-collection-requirements.yml"
 
 if [[ ! -e "${TEST_DIR}/elk_metrics_7x/tests/src" ]]; then