ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/vagrant: Drop support for Clearlinux

Browse Source 
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Idc0ca75b48cd680bacdd455206b88df6b99d0bff
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6635
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2021-03-02 17:52:43 +01:00 committed by Tomasz Zawadzki
parent ee191fa807
commit b5212f04e7
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/vagrant/Vagrantfile vendored
View File

@ -19,7 +19,6 @@ def get_box_type(distro)
'arch' => 'generic/arch', 'arch' => 'generic/arch',
'freebsd11' => 'generic/freebsd11', 'freebsd11' => 'generic/freebsd11',
'freebsd12' => 'generic/freebsd12', 'freebsd12' => 'generic/freebsd12',
'clearlinux' => 'AntonioMeireles/ClearLinux'
} }
abort("Invalid argument! #{distro}") unless distro_to_type.key?(distro) abort("Invalid argument! #{distro}") unless distro_to_type.key?(distro)
@ -97,9 +96,6 @@ end
def make_spdk_local_copy_of_nfs(config,distro) def make_spdk_local_copy_of_nfs(config,distro)
user_group = 'vagrant:vagrant' user_group = 'vagrant:vagrant'
if distro.include? 'clearlinux'
user_group = 'clear:clear'
end
spdk_path = '/home/vagrant/spdk_repo/spdk' spdk_path = '/home/vagrant/spdk_repo/spdk'
spdk_tmp_path = '/tmp/spdk' spdk_tmp_path = '/tmp/spdk'
@ -114,17 +110,6 @@ def make_spdk_local_copy_of_nfs(config,distro)
config.vm.provision "shell", inline: $spdk_repo_cmd config.vm.provision "shell", inline: $spdk_repo_cmd
end end
def clear_cflags(config)
$clearcflags_cmd = <<-SCRIPT
echo "export CFLAGS=" >> /etc/profile.d/clearcflags.sh
echo "export CFFLAGS=" >> /etc/profile.d/clearcflags.sh
echo "export CXXFLAGS=" >> /etc/profile.d/clearcflags.sh
echo "export FFLAGS=" >> /etc/profile.d/clearcflags.sh
echo "export THEANO_FLAGS=" >> /etc/profile.d/clearcflags.sh
SCRIPT
config.vm.provision "shell", inline: $clearcflags_cmd, run: "always"
end
def get_nvme_disk(disk, index) def get_nvme_disk(disk, index)
if ENV['NVME_FILE'] if ENV['NVME_FILE']
nvme_file = ENV['NVME_FILE'].split(',') nvme_file = ENV['NVME_FILE'].split(',')
@ -285,7 +270,7 @@ provider = (ENV['SPDK_VAGRANT_PROVIDER'] || "virtualbox")
# Get all variables for creating vm # Get all variables for creating vm
vmcpu = (ENV['SPDK_VAGRANT_VMCPU'] || 2) vmcpu = (ENV['SPDK_VAGRANT_VMCPU'] || 2)
vmram = (ENV['SPDK_VAGRANT_VMRAM'] || 4096) vmram = (ENV['SPDK_VAGRANT_VMRAM'] || 4096)
nfs_sync_backend_distros = ['freebsd', 'clearlinux'] nfs_sync_backend_distros = ['freebsd']
openstack_network = (ENV['SPDK_OPENSTACK_NETWORK'] || false) openstack_network = (ENV['SPDK_OPENSTACK_NETWORK'] || false)
# generic/freebsd boxes do not work properly with vagrant-proxyconf and # generic/freebsd boxes do not work properly with vagrant-proxyconf and
@ -337,10 +322,7 @@ Vagrant.configure(2) do |config|
# use http proxy if avaiable # use http proxy if avaiable
setup_proxy(config, distro) setup_proxy(config, distro)
# Clear CFLAGS in clear linux # freebsd boxes in order to have spdk sources synced from
clear_cflags(config) if distro == 'clearlinux'
# freebsd and clearlinux boxes in order to have spdk sources synced from
# host properly will use NFS with "ro" option enabled to prevent changes # host properly will use NFS with "ro" option enabled to prevent changes
# on host filesystem. # on host filesystem.
# To make sources usable in the guest VM we need to unmount them and use # To make sources usable in the guest VM we need to unmount them and use