diff --git a/roles/run-test/templates/toci_gate_test.sh.j2 b/roles/run-test/templates/toci_gate_test.sh.j2 index 83507d2db..782300390 100755 --- a/roles/run-test/templates/toci_gate_test.sh.j2 +++ b/roles/run-test/templates/toci_gate_test.sh.j2 @@ -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 diff --git a/roles/run-test/templates/toci_quickstart.sh.j2 b/roles/run-test/templates/toci_quickstart.sh.j2 index 4ae81ddd0..683c24c19 100755 --- a/roles/run-test/templates/toci_quickstart.sh.j2 +++ b/roles/run-test/templates/toci_quickstart.sh.j2 @@ -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 diff --git a/toci_quickstart.sh b/toci_quickstart.sh index 4486384be..61b2adb22 100755 --- a/toci_quickstart.sh +++ b/toci_quickstart.sh @@ -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