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