]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
build_container: Look for pipeline's source dir
authorZack Cerza <zack@cerza.org>
Tue, 25 Feb 2025 19:43:41 +0000 (12:43 -0700)
committerZack Cerza <zack@cerza.org>
Thu, 17 Apr 2025 19:07:21 +0000 (13:07 -0600)
Signed-off-by: Zack Cerza <zack@cerza.org>
scripts/build_container

index bd127317490b9917d71be1d1fb9c0ca10f497b19..aef0d97db10279a2f1a38432bca2d97df3582880 100755 (executable)
@@ -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