openstack
/
openstack-ansible-ops
Code Issues Proposed changes

elk7: minimal fixes to CI jobs 

This is a minimal patch to address failing CI to enable
other patches to be submitted.

Similar patches are likely to be required for other OSA
ops components, but this will be tackled at a later date.

Change-Id: I6020d7b820c1f7d781691df9a1d657aef0ea010b
This commit is contained in:
Andrew Bonney 2022-05-26 11:16:02 +01:00
parent f2fe9aa59f
commit 7cfcbbeccf
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elk_metrics_7x/ansible-collection-requirements.yml Normal file
View File

@ -0,0 +1,6 @@
---
collections:
- name: https://opendev.org/openstack/ansible-config_template
version: master
type: git

6
elk_metrics_7x/tests/ansible-collection-requirements.yml Normal file
View File

@ -0,0 +1,6 @@
---
collections:
- name: https://opendev.org/openstack/ansible-config_template
version: master
type: git

4
elk_metrics_7x/tests/functional.yml
View File

@ -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"

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

@ -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