Replace deprecated ruby function

Signed-off-by: Manuel Buil <[email protected]>
k3s-io · May 13, 2024 · dba30ab · dba30ab
1 parent 1454953
commit dba30ab
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 31 deletions.
diff --git a/tests/e2e/btrfs/Vagrantfile b/tests/e2e/btrfs/Vagrantfile
@@ -20,7 +20,7 @@ def provision(vm, role, role_num, node_num)
  vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
 
  vagrant_defaults = '../vagrantdefaults.rb'
- load vagrant_defaults if File.exists?(vagrant_defaults)
+ load vagrant_defaults if File.exist?(vagrant_defaults)
 
  defaultOSConfigure(vm)
  install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH)

diff --git a/tests/e2e/dualstack/Vagrantfile b/tests/e2e/dualstack/Vagrantfile
@@ -26,8 +26,8 @@ def provision(vm, role, role_num, node_num)
  :libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
  :libvirt__ipv6_prefix => "64"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" 
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts" 
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/embeddedmirror/Vagrantfile b/tests/e2e/embeddedmirror/Vagrantfile
@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
  node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
  vm.network "private_network", ip: node_ip, netmask: "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/externalip/Vagrantfile b/tests/e2e/externalip/Vagrantfile
@@ -20,8 +20,8 @@ def provision(vm, role, role_num, node_num)
  vm.network "private_network", :ip => node_ip4, :netmask => "255.255.255.0"
  vm.network "private_network", :ip => node_ip4_public, :netmask => "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" 
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts" 
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/privateregistry/Vagrantfile b/tests/e2e/privateregistry/Vagrantfile
@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
  node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
  vm.network "private_network", ip: node_ip, netmask: "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/rootless/Vagrantfile b/tests/e2e/rootless/Vagrantfile
@@ -17,8 +17,8 @@ def provision(vm, role, role_num, node_num)
  vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
 
  vagrant_defaults = '../vagrantdefaults.rb'
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
- load vagrant_defaults if File.exists?(vagrant_defaults)
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
+ load vagrant_defaults if File.exist?(vagrant_defaults)
 
  defaultOSConfigure(vm)
  addCoverageDir(vm, role, GOCOVER)

diff --git a/tests/e2e/rotateca/Vagrantfile b/tests/e2e/rotateca/Vagrantfile
@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
  vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
 
  vagrant_defaults = '../vagrantdefaults.rb'
- load vagrant_defaults if File.exists?(vagrant_defaults)
+ load vagrant_defaults if File.exist?(vagrant_defaults)
 
  defaultOSConfigure(vm)
  addCoverageDir(vm, role, GOCOVER)

diff --git a/tests/e2e/s3/Vagrantfile b/tests/e2e/s3/Vagrantfile
@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
  node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
  vm.network "private_network", ip: node_ip, netmask: "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/secretsencryption/Vagrantfile b/tests/e2e/secretsencryption/Vagrantfile
@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
  vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
 
  vagrant_defaults = '../vagrantdefaults.rb'
- load vagrant_defaults if File.exists?(vagrant_defaults)
+ load vagrant_defaults if File.exist?(vagrant_defaults)
 
  defaultOSConfigure(vm)
  addCoverageDir(vm, role, GOCOVER)

diff --git a/tests/e2e/secretsencryption_old/Vagrantfile b/tests/e2e/secretsencryption_old/Vagrantfile
@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
  vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
 
  vagrant_defaults = '../vagrantdefaults.rb'
- load vagrant_defaults if File.exists?(vagrant_defaults)
+ load vagrant_defaults if File.exist?(vagrant_defaults)
 
  defaultOSConfigure(vm)
  addCoverageDir(vm, role, GOCOVER)

diff --git a/tests/e2e/snapshotrestore/Vagrantfile b/tests/e2e/snapshotrestore/Vagrantfile
@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
  node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
  vm.network "private_network", ip: node_ip, netmask: "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/splitserver/Vagrantfile b/tests/e2e/splitserver/Vagrantfile
@@ -17,7 +17,7 @@ def provision(vm, role, role_num, node_num)
  # An expanded netmask is required to allow VM<-->VM communication, virtualbox defaults to /32
  vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
 
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/startup/Vagrantfile b/tests/e2e/startup/Vagrantfile
@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
  vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
 
  vagrant_defaults = '../vagrantdefaults.rb'
- load vagrant_defaults if File.exists?(vagrant_defaults)
+ load vagrant_defaults if File.exist?(vagrant_defaults)
 
  defaultOSConfigure(vm)
  dockerInstall(vm)

diff --git a/tests/e2e/tailscale/Vagrantfile b/tests/e2e/tailscale/Vagrantfile
@@ -19,8 +19,8 @@ def provision(vm, roles, role_num, node_num)
  node_ip4 = "#{NETWORK4_PREFIX}.#{100+node_num}"
  vm.network "private_network", ip: node_ip4, netmask: "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" 
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts" 
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/token/Vagrantfile b/tests/e2e/token/Vagrantfile
@@ -18,8 +18,8 @@ def provision(vm, roles, role_num, node_num)
  node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
  vm.network "private_network", ip: node_ip, netmask: "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" 
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts" 
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/upgradecluster/Vagrantfile b/tests/e2e/upgradecluster/Vagrantfile
@@ -22,8 +22,8 @@ def provision(vm, role, role_num, node_num)
  node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
  vm.network "private_network", ip: node_ip, netmask: "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/vagrantdefaults.rb b/tests/e2e/vagrantdefaults.rb
@@ -25,7 +25,7 @@ def getInstallType(vm, release_version, branch, release_channel='')
  return "INSTALL_K3S_CHANNEL=#{release_channel}"
  else
  jqInstall(vm)
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" 
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts" 
  # Grabs the last 5 commit SHA's from the given branch, then purges any commits that do not have a passing CI build
  # MicroOS requires it not be in a /tmp/ or other root system folder
  vm.provision "Get latest commit", type: "shell", path: scripts_location +"/latest_commit.sh", args: [branch, "/tmp/k3s_commits"]

diff --git a/tests/e2e/validatecluster/Vagrantfile b/tests/e2e/validatecluster/Vagrantfile
@@ -24,8 +24,8 @@ def provision(vm, role, role_num, node_num)
  node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
  vm.network "private_network", ip: node_ip, netmask: "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" 
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts" 
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)

diff --git a/tests/e2e/wasm/Vagrantfile b/tests/e2e/wasm/Vagrantfile
@@ -33,8 +33,8 @@ def provision(vm, role, role_num, node_num)
  node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
  vm.network "private_network", ip: node_ip, netmask: "255.255.255.0"
 
- scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
- vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
+ scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
+ vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
  load vagrant_defaults
 
  defaultOSConfigure(vm)