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

test/common: Remove vm_setup.sh 



Together with the deprecation notice.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent e582609a

docker/build_base/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ RUN mkdir -p "$spdk_repo" && \ 
	chown -R root:root "$spdk_repo"

RUN dnf install -y rpm-build

RUN "$spdk_repo/scripts/pkgdep.sh" -d

RUN "$spdk_repo/test/common/config/vm_setup.sh" --test-conf=fio

RUN "$spdk_repo/test/common/config/autotest_setup.sh" --test-conf=fio



# HACK: In case we received a .tar with built SPDK we need to overwrite the

# configuration to update all the paths make would need to lookup - this is

scripts/bash-completion/spdk

+0 −1
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ _spdk_apps() { 
		create_vbox.sh

		pkgdep.sh

		run-autorun.sh

		vm_setup.sh

		autotest_setup.sh

	) # TODO: Add more?

scripts/qat_setup.sh

+5 −5
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ rootdir=$(readlink -f $(dirname $0))/.. 
allowed_drivers=("igb_uio" "uio_pci_generic")



reload_intel_qat() {

	# We need to make sure the out-of-tree intel_qat driver, provided via vm_setup.sh, is in

	# use. Otherwise, some dependency modules loaded by qat_service may fail causing some

	# disturbance later on during the tests - in particular, it's been seen that the adf_ctl

	# was returning inconsistent data (wrong pci addresses), confusing the service into

	# believing SR-IOV is not enabled.

	# We need to make sure the out-of-tree intel_qat driver, provided via autotest_setup.sh,

	# is in use. Otherwise, some dependency modules loaded by qat_service may fail causing

	# some disturbance later on during the tests - in particular, it's been seen that the

	# adf_ctl was returning inconsistent data (wrong pci addresses), confusing the service

	# into believing SR-IOV is not enabled.



	# If this file doesn't exist, then either intel_qat is a kernel built-in or is not loaded.

	# Nothing to do in such cases, qat_service will load the module for us.

scripts/vagrant/README.md

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ This script will: 
4. rsync the `~/.gitconfig` file to `/home/vagrant/` in the newly provisioned virtual box

5. rsync a copy of the source `spdk` repository to `/home/vagrant/spdk_repo/spdk` (optional)

6. rsync a copy of the `~/vagrant_tools` directory to `/home/vagrant/tools` (optional)

7. execute vm_setup.sh on the guest to install all spdk dependencies (optional)

7. execute autotest_setup.sh on the guest to install all spdk dependencies (optional)



This arrangement allows the provisioning of multiple, different VMs within that same directory hierarchy using the same

spdk repository. Following the creation of the vm you'll need to ssh into your virtual box and finish the VM initialization.
@@ -199,7 +199,7 @@ Following VM initialization you must: 


### Running autorun.sh with vagrant



After running vm_setup.sh the `run-autorun.sh` can be used to run `spdk/autorun.sh` on a Fedora vagrant machine.

After running autotest_setup.sh the `run-autorun.sh` can be used to run `spdk/autorun.sh` on a Fedora vagrant machine.

Note that the `spdk/scripts/vagrant/autorun-spdk.conf` should be copied to `~/autorun-spdk.conf` before starting your tests.



```bash

scripts/vagrant/Vagrantfile

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ def deploy_test_vm(config, distro, plugins_sync_backend) 
  make_spdk_local_copy_of_nfs(config,distro) if plugins_sync_backend[:type] == :nfs



  config.vm.provision "shell" do |setup|

    setup.inline = "/home/vagrant/spdk_repo/spdk/test/common/config/vm_setup.sh"

    setup.inline = "/home/vagrant/spdk_repo/spdk/test/common/config/autotest_setup.sh"

    setup.privileged = false

    setup.args = ["-u", "-i"]

  end