From b94e52f55a0c4f9d6f3a771179da4ec5ccbddbd7 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Fri, 29 Apr 2022 19:35:41 +0200
Subject: Fix ironic-lib from source and branch detection in IPA builds

Prevents the ironic-lib CI from testing ironic-lib changes in IPA.

Change-Id: I936f6c1506c585826501ff3ac0bad0c755b4d360
---
 devstack/lib/ironic | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'devstack')

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 9ef5d7d04..ef1081752 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -2775,6 +2775,9 @@ function build_tinyipa_ramdisk {
         export AUTHORIZE_SSH=true
         export SSH_PUBLIC_KEY=$IRONIC_ANSIBLE_SSH_KEY.pub
     fi
+    if [ -e $DEST/ironic-lib ]; then
+        export IRONIC_LIB_SOURCE="$DEST/ironic-lib"
+    fi
     make
     cp tinyipa.gz $ramdisk_path
     cp tinyipa.vmlinuz $kernel_path
@@ -2825,9 +2828,10 @@ function build_ipa_dib_ramdisk {
         install_diskimage_builder
     fi
 
-    if -e $DEST/ironic-lib; then
+    if [ -e $DEST/ironic-lib ]; then
         export IRONIC_LIB_FROM_SOURCE=true
         export DIB_REPOLOCATION_ironic_lib=$DEST/ironic-lib
+        export DIB_REPOREF_ironic_lib=$TARGET_BRANCH
     fi
 
     echo "Building IPA ramdisk with DIB options: $IRONIC_DIB_RAMDISK_OPTIONS"
@@ -2839,7 +2843,9 @@ function build_ipa_dib_ramdisk {
         DIB_DHCP_TIMEOUT=$IRONIC_DIB_DHCP_TIMEOUT \
         DIB_RELEASE=$IRONIC_DIB_RAMDISK_RELEASE \
         DIB_REPOLOCATION_ironic_python_agent="$IRONIC_PYTHON_AGENT_DIR" \
+        DIB_REPOREF_ironic_python_agent=$TARGET_BRANCH \
         DIB_REPOLOCATION_requirements="$DEST/requirements" \
+        DIB_REPOREF_requirements=$TARGET_BRANCH \
         disk-image-create "$IRONIC_DIB_RAMDISK_OPTIONS" \
         -x -o  "$tempdir/ironic-agent" \
         ironic-python-agent-ramdisk
-- 
cgit v1.2.1