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

scripts/vagrant: Use custom rsync cmdline 



By default, vagrant executes rsync with --copy-links argument which
instead of copying the actual symlink is actually copying the file
given link points to. Since symlinks are part of the spdk repo,
they need to be synced "as is" - when symlinks are replaced with
actual regular files, git will report that as a typechange, messing
up status checks that our tests perform.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Community-CI: Mellanox Build Bot
parent f4e27ffa

scripts/vagrant/Vagrantfile

+5 −1
Original line number Diff line number Diff line
@@ -60,7 +60,11 @@ Vagrant.configure(2) do |config| 
  # generic/fedora boxes on the other hand have problems running NFS

  # service so use sshfs+rsync combo instead.

  plugins_sync_backend = {type: :sshfs}

  files_sync_backend = {type: "rsync", rsync__auto: false}

  # Remove --copy-links from default rsync cmdline since we do want to sync

  # actual symlinks as well. Also, since copy is made between host and its

  # local VM we don't need to worry about saturating the local link so skip

  # the compression to speed up the whole transfer.

  files_sync_backend = {type: "rsync", rsync__auto: false, rsync__args: ["--archive", "--verbose", "--delete"]}

  if (distro.include? "freebsd") || (distro.include? "clearlinux")

    plugins_sync_backend = {type: :nfs, nfs_udp: false}

    files_sync_backend = {type: :nfs, nfs_udp: false,  mount_options: ['ro']}