openstack/tripleo-ci
Code Issues Proposed changes

Use local tripleo-operator-ansible if available

Browse Source 
We want to use the local CI provided verison if available so this change
adds tripleo-operator-ansible to the list of repos we pull from zuul in
the gate.

Also fix the ansible collections paths var.

https://docs.ansible.com/ansible/latest/reference_appendices/config.html#envvar-ANSIBLE_COLLECTIONS_PATHS

Change-Id: I653343122882d5b7d7c4435ad6492a78d03f7b37
This commit is contained in:
Alex Schultz
2020-01-07 14:42:36 -07:00
parent ac38bdbb64
commit e32e613899
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/run-test/templates/toci_gate_test.sh.j2
View File

@@ -133,7 +133,8 @@ fi
# Import gated external repo in oooq - starting with browbeat, tripleo-ha-utils, openstack-ansible-os_tempest,
# ansible-config_template, ansible-role-python_venv_build, ansible-role-collect-logs
EXTERNAL_REPOS="x/browbeat openstack/tripleo-ha-utils openstack/tripleo-quickstart-extras openstack/openstack-ansible-os_tempest \
openstack/ansible-config_template openstack/ansible-role-python_venv_build openstack/ansible-role-collect-logs"
openstack/ansible-config_template openstack/ansible-role-python_venv_build openstack/ansible-role-collect-logs \
openstack/tripleo-operator-ansible"
for EXTERNAL_REPO in $EXTERNAL_REPOS; do
if [[ -d ${TRIPLEO_ROOT%openstack}/$EXTERNAL_REPO ]]; then
sed -i "s#git+https://opendev.org/$EXTERNAL_REPO#file://${TRIPLEO_ROOT%openstack}/$EXTERNAL_REPO#1" ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt

2
roles/run-test/templates/toci_quickstart.sh.j2
View File

@@ -111,7 +111,7 @@ $QUICKSTART_VENV_CMD
OOOQ_DIR={{ tripleo_root }}/tripleo-quickstart/
export OPT_WORKDIR=$LOCAL_WORKING_DIR
export ANSIBLE_CONFIG=$OOOQ_DIR/ansible.cfg
export ANSIBLE_COLLECTIONS_PATH="$OPT_WORKDIR/share/ansible/collections:~/.ansible/collections:/usr/share/ansible/collections"
export ANSIBLE_COLLECTIONS_PATHS="$OPT_WORKDIR/share/ansible/collections:~/.ansible/collections:/usr/share/ansible/collections"
export ARA_DATABASE="sqlite:///${LOCAL_WORKING_DIR}/ara.sqlite"
export VIRTUAL_ENV_DISABLE_PROMPT=1
# Workaround for virtualenv issue https://github.com/pypa/virtualenv/issues/1029

2
toci_quickstart.sh
View File

@@ -109,7 +109,7 @@ $QUICKSTART_VENV_CMD
OOOQ_DIR=$TRIPLEO_ROOT/tripleo-quickstart/
export OPT_WORKDIR=$LOCAL_WORKING_DIR
export ANSIBLE_CONFIG=$OOOQ_DIR/ansible.cfg
export ANSIBLE_COLLECTIONS_PATH="$OPT_WORKDIR/share/ansible/collections:~/.ansible/collections:/usr/share/ansible/collections"
export ANSIBLE_COLLECTIONS_PATHS="$OPT_WORKDIR/share/ansible/collections:~/.ansible/collections:/usr/share/ansible/collections"
export ARA_DATABASE="sqlite:///${LOCAL_WORKING_DIR}/ara.sqlite"
export VIRTUAL_ENV_DISABLE_PROMPT=1
# Workaround for virtualenv issue https://github.com/pypa/virtualenv/issues/1029