Commit 3369ef45 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/vhost: Remove tests dependent on centos image 



Said image is not used by the CI at all, drop support for it.

Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: I3493e8c5f808e56cfb0304a04cfa90ab3700018c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6542


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 5261f638

test/vhost/lvol/lvol_test.sh

+1 −8
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ function usage() { 
	echo "                          on different CPU cores instead of single core."

	echo "                          Default: False"

	echo "-x                        set -x for script debug"

	echo "    --multi-os            Run tests on different os types in VMs"

	echo "                          Default: False"

	exit 0

}
@@ -87,7 +85,6 @@ while getopts 'xh-:' optchar; do 
				nested-lvol) nested_lvol=true ;;

				distribute-cores) distribute_cores=true ;;

				thin-provisioning) thin=" -t " ;;

				multi-os) multi_os=true ;;

				*) usage $0 "Invalid argument '$OPTARG'" ;;

			esac

			;;
@@ -187,11 +184,7 @@ for ((i = 0; i < vm_count; i++)); do 
	bdevs=($bdevs)



	setup_cmd="vm_setup --disk-type=$ctrl_type --force=$i"

	if [[ $i%2 -ne 0 ]] && [[ $multi_os ]]; then

		setup_cmd+=" --os=/home/sys_sgsw/spdk_vhost_CentOS_vm_image.qcow2"

	else

	setup_cmd+=" --os=$VM_IMAGE"

	fi



	# Create single SCSI controller or multiple BLK controllers for this VM

	if $distribute_cores; then

test/vhost/manual.sh

+0 −2
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ rootdir=$(readlink -f $testdir/../..) 
source $rootdir/test/common/autotest_common.sh

source $rootdir/test/vhost/common.sh



CENTOS_VM_IMAGE="/home/sys_sgsw/spdk_vhost_CentOS_vm_image.qcow2"

DEFAULT_FIO_BIN="/home/sys_sgsw/fio_ubuntu"

CENTOS_FIO_BIN="/home/sys_sgsw/fio_ubuntu_bak"



case $1 in

	-h | --help)

test/vhost/vhost.sh

+0 −12
Original line number Diff line number Diff line
@@ -12,9 +12,7 @@ if [[ $(uname -s) != Linux ]]; then 
	exit 0

fi



CENTOS_VM_IMAGE="/home/sys_sgsw/spdk_vhost_CentOS_vm_image.qcow2"

DEFAULT_FIO_BIN="/home/sys_sgsw/fio_ubuntu"

CENTOS_FIO_BIN="/home/sys_sgsw/fio_ubuntu_bak"



: ${FIO_BIN="$DEFAULT_FIO_BIN"}
@@ -61,11 +59,6 @@ if [ $RUN_NIGHTLY -eq 1 ]; then 
		run_test "vhost_scsi_1core_2ctrl" $WORKDIR/lvol/lvol_test.sh --fio-bin=$FIO_BIN \

			--ctrl-type=spdk_vhost_scsi --max-disks=2 --vm-count=2

	fi

	if [[ -e $CENTOS_VM_IMAGE ]]; then

		echo 'Running lvol integrity nightly suite with different os types'

		run_test "vhost_scsi_nightly" $WORKDIR/lvol/lvol_test.sh --fio-bin=$CENTOS_FIO_BIN \

			--ctrl-type=spdk_vhost_scsi --vm-count=2 --multi-os

	fi

	echo 'Running lvol integrity nightly suite with one core and one controller'

	run_test "vhost_scsi_1core_1ctrl" $WORKDIR/lvol/lvol_test.sh --fio-bin=$FIO_BIN \

		--ctrl-type=spdk_vhost_scsi --max-disks=1
@@ -79,11 +72,6 @@ if [ $RUN_NIGHTLY -eq 1 ]; then 
		run_test "vhost_blk_1core_2ctrl" $WORKDIR/lvol/lvol_test.sh --fio-bin=$FIO_BIN \

			--ctrl-type=spdk_vhost_blk --max-disks=2 --vm-count=2

	fi

	if [[ -e $CENTOS_VM_IMAGE ]]; then

		echo 'Running lvol integrity nightly suite with different os types'

		run_test "vhost_blk_nightly" $WORKDIR/lvol/lvol_test.sh --fio-bin=$CENTOS_FIO_BIN \

			--ctrl-type=spdk_vhost_blk --vm-count=2 --multi-os

	fi

	echo 'Running lvol integrity nightly suite with one core and one controller'

	run_test "vhost_lvol_integrity_1core_1ctrl" $WORKDIR/lvol/lvol_test.sh --fio-bin=$FIO_BIN \

		--ctrl-type=spdk_vhost_blk --max-disks=1