From 3c25d21aacf42c9f91b5eda9df08fd01e299eb35 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 24 Mar 2025 11:07:49 +0100
Subject: [PATCH] CI: Ensure nova is available when running tox jobs

Change-Id: I2f751c994cb6b162611b38b582f459e4ab849d39
---
 .zuul.yaml           | 30 ++++++++++++++++++++++++++++++
 tools/tox_install.sh |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

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