From db031ec1f51c24fbbebd6dff3810e6cb93f2943b Mon Sep 17 00:00:00 2001 From: Adam Rozman Date: Tue, 1 Oct 2024 09:51:22 +0300 Subject: [PATCH] fix IPA git commit/branch refference This commit: - Fixes an icorrect value assignment for IPA repository refference This bug was causing the build tooling to not check out the specified IPA branch instead it was checking out the mian - Adds missing IPA repository address variable Signed-off-by: Adam Rozman --- jenkins/scripts/dynamic_worker_workflow/build_ipa.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jenkins/scripts/dynamic_worker_workflow/build_ipa.sh b/jenkins/scripts/dynamic_worker_workflow/build_ipa.sh index 62123a9e..d7a728b9 100755 --- a/jenkins/scripts/dynamic_worker_workflow/build_ipa.sh +++ b/jenkins/scripts/dynamic_worker_workflow/build_ipa.sh @@ -66,7 +66,7 @@ METADATA_PATH="/tmp/metadata.txt" sudo rm -rf "${IPA_BUILD_WORKSPACE}" # Update apt packages -sudo apt-get update -y +sudo apt-get update -y # Install required packages sudo apt-get install --yes python3-pip python3-virtualenv qemu-utils @@ -114,7 +114,8 @@ python3 -m pip install "./${IPA_BUILDER_PATH}" # Configure the IPA builder to pull the IPA source from Nordix fork export DIB_REPOLOCATION_ironic_python_agent="${IPA_BUILD_WORKSPACE}/ironic-python-agent" export DIB_REPOREF_requirements="${OPENSTACK_REQUIREMENTS_REF}" -export DIB_REPOREF_ironic_python_agent="${IPA_REF}" +export DIB_REPOREF_ironic_python_agent="${IPA_BRANCH}" +export DIB_REPOLOCATION_ironic_python_agent="${IPA_REPO}" export DIB_DEV_USER_USERNAME=metal3 if [ "${ENABLE_DEV_USER_PASS}" == "true" ]; then export DIB_DEV_USER_PWDLESS_SUDO=yes