Commit e16128ce authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

scripts/vagrant: remove vhost test configuration steps 



We are not using VMs to run Vhost tests (at least at
the moment) and these steps are outdated. These steps
will need a re-write if we decide to put them back in,
so we can remove them for now.

Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Change-Id: I61d09bdc481814d8bcf6fe86ed4ccd84b36ad8d9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1155


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 2f96a090

scripts/vagrant/Vagrantfile

+0 −9
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ Vagrant.configure(2) do |config| 
  vmcpu=(ENV['SPDK_VAGRANT_VMCPU'] || 2)

  vmram=(ENV['SPDK_VAGRANT_VMRAM'] || 4096)

  spdk_dir=(ENV['SPDK_DIR'] || "none")

  vhost_host_dir=(ENV['VHOST_HOST_DIR'] || "none")

  vhost_vm_dir=(ENV['VHOST_VM_DIR'] || "none")

  vmemulator=(ENV['SPDK_QEMU_EMULATOR'] || "")

  emulated_nvme_types=(ENV['NVME_DISKS_TYPE'] || "nvme").split(',')

  nvme_namespaces=(ENV['NVME_DISKS_NAMESPACES'] || "").split(',')
@@ -191,13 +189,6 @@ Vagrant.configure(2) do |config| 
    end

  end



  if vhost_host_dir != "none"

      config.vm.synced_folder "#{vhost_host_dir}", "#{vhost_vm_dir}", type: "rsync", rsync__auto: false

      config.vm.provision "shell", inline: "sudo mkdir -p /root/.ssh"

      config.vm.provision "shell", inline: "sudo cp #{vhost_vm_dir}/spdk_vhost_id_rsa* /root/.ssh"

      config.vm.provision "shell", inline: "sudo chmod 600 /root/.ssh/spdk_vhost_id_rsa"

  end



  # Copy in the user's tools if they exists

  if File.directory?(File.expand_path("~/vagrant_tools"))

    config.vm.synced_folder "~/vagrant_tools", "/home/vagrant/tools", type: "rsync", rsync__auto: false

scripts/vagrant/create_vbox.sh

+0 −15
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ display_help() { 
	echo "  -n <num-cpus> 1 to 4            default: ${SPDK_VAGRANT_VMCPU}"

	echo "  -x <http-proxy>                 default: \"${SPDK_VAGRANT_HTTP_PROXY}\""

	echo "  -p <provider>                   libvirt or virtualbox"

	echo "  --vhost-host-dir=<path>         directory path with vhost test dependencies"

	echo "                                  (test VM qcow image, fio binary, ssh keys)"

	echo "  --vhost-vm-dir=<path>           directory where to put vhost dependencies in VM"

	echo "  --qemu-emulator=<path>          directory path with emulator, default: ${SPDK_QEMU_EMULATOR}"

	echo "  --vagrantfiles-dir=<path>       directory to put vagrantfile"

	echo "  -u                              allow password authentication to vagrant box"
@@ -85,8 +82,6 @@ while getopts ":b:n:s:x:p:u:vcrldh-:" opt; do 
		-)

		case "${OPTARG}" in

			package-box) VAGRANT_PACKAGE_BOX=1 ;;

			vhost-host-dir=*) VHOST_HOST_DIR="${OPTARG#*=}" ;;

			vhost-vm-dir=*) VHOST_VM_DIR="${OPTARG#*=}" ;;

			qemu-emulator=*) SPDK_QEMU_EMULATOR="${OPTARG#*=}" ;;

			vagrantfiles-dir=*) VAGRANTFILE_DIR="${OPTARG#*=}" ;;

			*) echo "Invalid argument '$OPTARG'" ;;
@@ -222,8 +217,6 @@ if [ ${VERBOSE} = 1 ]; then 
	echo SPDK_VAGRANT_VMRAM=$SPDK_VAGRANT_VMRAM

	echo SPDK_VAGRANT_PROVIDER=$SPDK_VAGRANT_PROVIDER

	echo SPDK_VAGRANT_HTTP_PROXY=$SPDK_VAGRANT_HTTP_PROXY

	echo VHOST_HOST_DIR=$VHOST_HOST_DIR

	echo VHOST_VM_DIR=$VHOST_VM_DIR

	echo SPDK_QEMU_EMULATOR=$SPDK_QEMU_EMULATOR

	echo VAGRANT_PACKAGE_BOX=$VAGRANT_PACKAGE_BOX

	echo
@@ -244,14 +237,6 @@ if [ -n "$SPDK_VAGRANT_PROVIDER" ]; then 
    provider="--provider=${SPDK_VAGRANT_PROVIDER}"

fi



if [ -n "$VHOST_HOST_DIR" ]; then

    export VHOST_HOST_DIR

fi



if [ -n "$VHOST_VM_DIR" ]; then

    export VHOST_VM_DIR

fi



if [ -n "$SPDK_VAGRANT_PROVIDER" ]; then

    export SPDK_VAGRANT_PROVIDER

fi