diff --git a/.zuul.yaml b/.zuul.yaml index 0953139..db81772 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,35 @@ +- project-template: + name: openstack-python3-jobs-blazar-nova + description: | + The standard :zuul:project_template:`openstack-python-jobs` but with nova + added as a required-projects. This checks out the project code and allows + tox_install.sh to use nova when building the venv. + check: + jobs: + - openstack-tox-pep8: + required-projects: + - openstack/nova + - openstack-tox-py39: + required-projects: + - openstack/nova + - openstack-tox-py312: + required-projects: + - openstack/nova + gate: + jobs: + - openstack-tox-pep8: + required-projects: + - openstack/nova + - openstack-tox-py39: + required-projects: + - openstack/nova + - openstack-tox-py312: + required-projects: + - openstack/nova + - project: templates: - check-requirements - openstack-python3-jobs + - openstack-python3-jobs-blazar-nova - release-notes-jobs-python3 diff --git a/tools/tox_install.sh b/tools/tox_install.sh index a635457..6e81744 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -52,7 +52,7 @@ elif [ $nova_installed -eq 0 ]; then elif [ -d "/opt/git/opendev.org/openstack/nova" ]; then echo "PIP LOCAL" > /tmp/tox_install.txt if [ -z "$NOVA_PIP_LOCATION" ]; then - NOVA_PIP_LOCATION="git+file:///opt/git/opendev.org/openstack/nova@$BRANCH_NAME#egg=nova" + NOVA_PIP_LOCATION="git+file:///home/zuul/src/opendev.org/openstack/nova@$BRANCH_NAME#egg=nova" fi $install_cmd -U -e ${NOVA_PIP_LOCATION} else