From 09b7b255f5c08beb7748bb9b4a9508561e50b774 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 14 Jan 2020 22:42:09 +0800 Subject: [PATCH] ceph-build: apply 604882e9 to ceph-build to address following failure + cd ceph-14.2.6 ceph-14.2.6.tar.bz2 ceph-14.2.6.tar.gz /tmp/jenkins10747333749307639424.sh: line 1058: cd: too many arguments Signed-off-by: Kefu Chai --- ceph-build/build/setup_deb | 2 +- ceph-build/build/setup_rpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb index 167f721f..af9a8fca 100644 --- a/ceph-build/build/setup_deb +++ b/ceph-build/build/setup_deb @@ -26,7 +26,7 @@ $SUDO apt-get install -y lsb-release # unpack the tar.gz that contains the debian dir cd dist tar xzf *.orig.tar.gz -cd ceph-* +cd $(basename *.orig.tar.gz .orig.tar.gz | sed s/_/-/) pwd BRANCH=`branch_slash_filter $BRANCH` diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index 689d750f..601acb94 100644 --- a/ceph-build/build/setup_rpm +++ b/ceph-build/build/setup_rpm @@ -26,7 +26,7 @@ $SUDO yum install -y redhat-lsb-core # unpack the tar.gz that contains the debian dir cd dist tar xzf *.orig.tar.gz -cd ceph-* +cd $(basename *.orig.tar.gz .orig.tar.gz | sed s/_/-/) pwd $SUDO yum install -y yum-utils -- 2.47.3