diff options
| author | Zuul <zuul@review.opendev.org> | 2022-05-04 15:15:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-05-04 15:15:31 +0000 |
| commit | 0a68e224992264b347ed51cf5dde77550f653cb6 (patch) | |
| tree | c3e8bb9289256e0cb33df3b29d63055b0e3019a5 | |
| parent | 93a993d0265457c14c91bd7f058fcb5a86c6fd07 (diff) | |
| parent | 5a2d2df4725e696242945996996c949a8c2e5f76 (diff) | |
| download | ironic-0a68e224992264b347ed51cf5dde77550f653cb6.tar.gz | |
Merge "Fix ironic-lib from source and branch detection in IPA builds" into stable/yoga
| -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 |