diff --git a/elk_metrics_7x/ansible-collection-requirements.yml b/elk_metrics_7x/ansible-collection-requirements.yml new file mode 100644 index 00000000..377d586a --- /dev/null +++ b/elk_metrics_7x/ansible-collection-requirements.yml @@ -0,0 +1,6 @@ +--- + +collections: +- name: https://opendev.org/openstack/ansible-config_template + version: master + type: git diff --git a/elk_metrics_7x/tests/ansible-collection-requirements.yml b/elk_metrics_7x/tests/ansible-collection-requirements.yml new file mode 100644 index 00000000..377d586a --- /dev/null +++ b/elk_metrics_7x/tests/ansible-collection-requirements.yml @@ -0,0 +1,6 @@ +--- + +collections: +- name: https://opendev.org/openstack/ansible-config_template + version: master + type: git diff --git a/elk_metrics_7x/tests/functional.yml b/elk_metrics_7x/tests/functional.yml index bfb9162d..902b6ecd 100644 --- a/elk_metrics_7x/tests/functional.yml +++ b/elk_metrics_7x/tests/functional.yml @@ -101,14 +101,14 @@ - name: Run ansible-galaxy (tests) 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" + 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" args: chdir: "src/{{ current_test_repo }}/elk_metrics_7x/tests" - name: Run ansible-galaxy (elk_metrics_7x) 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" + 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" 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 a6a62821..0ceda979 100755 --- a/elk_metrics_7x/tests/run-tests.sh +++ b/elk_metrics_7x/tests/run-tests.sh @@ -33,7 +33,8 @@ 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" + --role-file="${TEST_DIR}/elk_metrics_7x/tests/ansible-role-requirements.yml" \ + -r "${TEST_DIR}/elk_metrics_7x/tests/ansible-collection-requirements.yml" if [[ ! -e "${TEST_DIR}/elk_metrics_7x/tests/src" ]]; then ln -s ${TEST_DIR}/../ ${TEST_DIR}/elk_metrics_7x/tests/src