diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-04-29 19:35:41 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-05-02 12:20:34 +0200 |
| commit | 5a2d2df4725e696242945996996c949a8c2e5f76 (patch) | |
| tree | 33e3c36795fe482c6f5d8697f2970f8b8587acb3 | |
| parent | e5626ab9c7d1b71f078b90e4c785a4aaff6d05b3 (diff) | |
| download | ironic-5a2d2df4725e696242945996996c949a8c2e5f76.tar.gz | |
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
(cherry picked from commit b94e52f55a0c4f9d6f3a771179da4ec5ccbddbd7)
| -rw-r--r-- | devstack/lib/ironic | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 366eb03b8..b1fdf0e8a 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 |