From e16128cece92773683ca0971439f3c6dc43f41f7 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Thu, 5 Mar 2020 09:16:04 +0100 Subject: [PATCH] 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: Karol Latecki Change-Id: I61d09bdc481814d8bcf6fe86ed4ccd84b36ad8d9 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1155 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Maciej Wawryk Reviewed-by: Tomasz Zawadzki --- scripts/vagrant/Vagrantfile | 9 --------- scripts/vagrant/create_vbox.sh | 15 --------------- 2 files changed, 24 deletions(-) diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index 45b7667ff..6b92dbfc0 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -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 diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh index 81bdb42bc..7a456dfc3 100755 --- a/scripts/vagrant/create_vbox.sh +++ b/scripts/vagrant/create_vbox.sh @@ -32,9 +32,6 @@ display_help() { echo " -n 1 to 4 default: ${SPDK_VAGRANT_VMCPU}" echo " -x default: \"${SPDK_VAGRANT_HTTP_PROXY}\"" echo " -p libvirt or virtualbox" - echo " --vhost-host-dir= directory path with vhost test dependencies" - echo " (test VM qcow image, fio binary, ssh keys)" - echo " --vhost-vm-dir= directory where to put vhost dependencies in VM" echo " --qemu-emulator= directory path with emulator, default: ${SPDK_QEMU_EMULATOR}" echo " --vagrantfiles-dir= 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