From 616b010879647a4b236a19ade0ac897a79215b1c Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 25 Feb 2025 12:43:41 -0700 Subject: [PATCH] build_container: Look for pipeline's source dir Signed-off-by: Zack Cerza --- scripts/build_container | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build_container b/scripts/build_container index bd127317..aef0d97d 100755 --- a/scripts/build_container +++ b/scripts/build_container @@ -34,7 +34,8 @@ if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && "$RELEASE" =~ 8|9 ]] ; t # update_build_status "failed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH # exit 1 fi - # get into $WORKSPACE/$dist/ceph-$cephver, where the copied source tree is - cd ${WORKSPACE}/dist/ceph-${cephver}/container + cd ${WORKSPACE} + # older jobs used a versioned directory; ceph-dev-pipeline uses an unversioned dir. + [[ -d ./dist/ceph/container ]] && cd ./dist/ceph/container || cd dist/ceph-${cephver}/container CEPH_SHA1=${SHA1} ./build.sh fi -- 2.39.5