openstack/openstack-ansible-ops
Code Issues Proposed changes

Fix role installation in tests

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

Change-Id: Ia23f1102e76f57d20af755bd0fb26018c1cf632a
This commit is contained in:
Andrew Bonney 2022-10-28 14:28:03 +01:00
parent f74ad7d93b
commit 1480703942
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
elk_metrics_7x/tests/functional.yml
View File

@ -98,17 +98,31 @@
args: args:
chdir: "src/{{ current_test_repo }}/elk_metrics_7x" chdir: "src/{{ current_test_repo }}/elk_metrics_7x"
- name: Run ansible-galaxy (tests) - name: Run ansible-galaxy (tests roles)
become: yes become: yes
become_user: root 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: args:
chdir: "src/{{ current_test_repo }}/elk_metrics_7x/tests" 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: yes
become_user: root 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: args:
chdir: "src/{{ current_test_repo }}/elk_metrics_7x" chdir: "src/{{ current_test_repo }}/elk_metrics_7x"

5
elk_metrics_7x/tests/run-tests.sh
View File

@ -33,7 +33,10 @@ deactivate
${HOME}/ansible_venv/bin/ansible-galaxy install --force \ ${HOME}/ansible_venv/bin/ansible-galaxy install --force \
--roles-path="${HOME}/ansible_venv/repositories/roles" \ --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" -r "${TEST_DIR}/elk_metrics_7x/tests/ansible-collection-requirements.yml"
if [[ ! -e "${TEST_DIR}/elk_metrics_7x/tests/src" ]]; then if [[ ! -e "${TEST_DIR}/elk_metrics_7x/tests/src" ]]; then