Skip to content

Commit

Permalink
Replace deprecated exists by exist
Browse files Browse the repository at this point in the history 
Signed-off-by: Manuel Buil <[email protected]>
  • Loading branch information
@manuelbuil
manuelbuil committed May 10, 2024
1 parent 5fdcbf7 commit 0328dbc
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions tests/e2e/ciliumnokp/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ def provision(vm, roles, role_num, node_num)
:libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
:libvirt__ipv6_prefix => "64"

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)

scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
vm.provision "IPv6 Setup", type: "shell", path: scripts_location + "/ipv6.sh", args: [node_ip4, node_ip6, node_ip6_gw, "cilium", vm.box]

install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH)
Expand Down Expand Up @@ -92,4 +92,4 @@ Vagrant.configure("2") do |config|
provision(node.vm, roles, role_num, i)
end
end
end
end
4 changes: 2 additions & 2 deletions tests/e2e/dnscache/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ def provision(vm, roles, role_num, node_num)
:libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
:libvirt__ipv6_prefix => "64"

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)

scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
vm.provision "IPv6 Setup", type: "shell", path: scripts_location + "/ipv6.sh", args: [node_ip4, node_ip6, node_ip6_gw, CNI, vm.box]

install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH)
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/dualstack/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ def provision(vm, roles, role_num, node_num)
:libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
:libvirt__ipv6_prefix => "64"

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)

scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
vm.provision "IPv6 Setup", type: "shell", path: scripts_location + "/ipv6.sh", args: [node_ip4, node_ip6, node_ip6_gw, CNI, vm.box]

install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH)
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/mixedos/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
vm.network "private_network", ip: node_ip, 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)

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/mixedosbgp/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
vm.network "private_network", ip: node_ip, 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)

Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/multus/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ def provision(vm, roles, role_num, node_num)
:libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
:libvirt__ipv6_prefix => "64"

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)

scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
vm.provision "IPv6 Setup", type: "shell", path: scripts_location + "/ipv6.sh", args: [node_ip4, node_ip6, node_ip6_gw, CNI, vm.box]

install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH)
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/secretsencryption/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,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)
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/secretsencryption_old/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,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)
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/splitserver/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,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)
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/upgradecluster/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ 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/"
scripts_location = Dir.exist?("./scripts/") ? "./scripts/" : "../scripts/"
vagrant_defaults = '../vagrantdefaults.rb'
load vagrant_defaults if File.exists?(vagrant_defaults)
load vagrant_defaults if File.exist?(vagrant_defaults)

defaultOSConfigure(vm)

Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/vagrantdefaults.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def getInstallType(vm, version, branch)
return "INSTALL_RKE2_VERSION=#{version}"
end
# Grabs the last 5 commit SHA's from the given branch, then purges any commits that do not have a passing CI build
scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
vm.provision "shell", path: scripts_location + "/latest_commit.sh", args: [branch, "/tmp/rke2_commits"]
return "INSTALL_RKE2_COMMIT=$(head\ -n\ 1\ /tmp/rke2_commits)"
end
Expand All @@ -32,4 +32,4 @@ def loadManifests(vm, files)
files.each do |file|
vm.provision "file", source: file, destination: "/var/lib/rancher/rke2/server/manifests/#{File.basename(file)}"
end
end
end
4 changes: 2 additions & 2 deletions tests/e2e/validatecluster/Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,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)
Expand Down

0 comments on commit 0328dbc

Please sign in to comment.