Commit b89c1b98 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

autotest: remove support for $CEPH_DIR 



Now that we have scripts that work with the standalone 'ceph' utility,
drop support for the previous hard-coded Ceph source path.

Change-Id: I6d8db999e4fc33075dfafd9ba3734f95ad0f9351
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/373410


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 94efdd3f

scripts/autotest_common.sh

+2 −11
Original line number Diff line number Diff line
@@ -245,14 +245,7 @@ function start_iscsi_service() { 
}



function rbd_setup() {

	export CEPH_DIR=/home/sys_sgsw/ceph/build



	if [ -d $CEPH_DIR ]; then

		export RBD_POOL=rbd

		export RBD_NAME=foo

		(cd $CEPH_DIR && ../src/vstart.sh -d -n -x -l)

		/usr/local/bin/rbd create $RBD_NAME --size 1000

	elif hash ceph; then

	if hash ceph; then

		export RBD_POOL=rbd

		export RBD_NAME=foo

		(cd $rootdir/scripts/ceph && ./start.sh)
@@ -261,9 +254,7 @@ function rbd_setup() { 
}



function rbd_cleanup() {

	if [ -d $CEPH_DIR ]; then

		(cd $CEPH_DIR && ../src/stop.sh || true)

	elif hash ceph; then

	if hash ceph; then

		(cd $rootdir/scripts/ceph && ./stop.sh || true)

	fi

}

test/iscsi_tgt/rbd/rbd.sh

+2 −7
Original line number Diff line number Diff line
@@ -5,13 +5,8 @@ rootdir=$(readlink -f $testdir/../../..) 
source $rootdir/scripts/autotest_common.sh

source $rootdir/test/iscsi_tgt/common.sh



if [ -z $CEPH_DIR ] && ! hash ceph; then

	echo "Ceph directory not defined; skipping RBD tests"

	exit 0

fi



if [ ! -d $CEPH_DIR ] && ! hash ceph; then

	echo "Ceph directory not detected on this system; skipping RBD tests"

if ! hash ceph; then

	echo "Ceph not detected on this system; skipping RBD tests"

	exit 0

fi