Commit dba30ab2 authored by Manuel Buil's avatar Manuel Buil

Replace deprecated ruby function

Signed-off-by: 's avatarManuel Buil <mbuil@suse.com>
parent 14549535
...@@ -20,7 +20,7 @@ def provision(vm, role, role_num, node_num) ...@@ -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" vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
vagrant_defaults = '../vagrantdefaults.rb' vagrant_defaults = '../vagrantdefaults.rb'
load vagrant_defaults if File.exists?(vagrant_defaults) load vagrant_defaults if File.exist?(vagrant_defaults)
defaultOSConfigure(vm) defaultOSConfigure(vm)
install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH) install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH)
......
...@@ -26,8 +26,8 @@ def provision(vm, role, role_num, node_num) ...@@ -26,8 +26,8 @@ def provision(vm, role, role_num, node_num)
:libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1", :libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
:libvirt__ipv6_prefix => "64" :libvirt__ipv6_prefix => "64"
scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num) ...@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
node_ip = "#{NETWORK_PREFIX}.#{100+node_num}" node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
vm.network "private_network", ip: node_ip, netmask: "255.255.255.0" 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 = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -20,8 +20,8 @@ def provision(vm, role, role_num, node_num) ...@@ -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, :netmask => "255.255.255.0"
vm.network "private_network", :ip => node_ip4_public, :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" scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num) ...@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
node_ip = "#{NETWORK_PREFIX}.#{100+node_num}" node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
vm.network "private_network", ip: node_ip, netmask: "255.255.255.0" 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 = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -17,8 +17,8 @@ def provision(vm, role, role_num, node_num) ...@@ -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" vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
vagrant_defaults = '../vagrantdefaults.rb' vagrant_defaults = '../vagrantdefaults.rb'
scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
load vagrant_defaults if File.exists?(vagrant_defaults) load vagrant_defaults if File.exist?(vagrant_defaults)
defaultOSConfigure(vm) defaultOSConfigure(vm)
addCoverageDir(vm, role, GOCOVER) addCoverageDir(vm, role, GOCOVER)
......
...@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num) ...@@ -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" vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
vagrant_defaults = '../vagrantdefaults.rb' vagrant_defaults = '../vagrantdefaults.rb'
load vagrant_defaults if File.exists?(vagrant_defaults) load vagrant_defaults if File.exist?(vagrant_defaults)
defaultOSConfigure(vm) defaultOSConfigure(vm)
addCoverageDir(vm, role, GOCOVER) addCoverageDir(vm, role, GOCOVER)
......
...@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num) ...@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
node_ip = "#{NETWORK_PREFIX}.#{100+node_num}" node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
vm.network "private_network", ip: node_ip, netmask: "255.255.255.0" 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 = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num) ...@@ -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" vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
vagrant_defaults = '../vagrantdefaults.rb' vagrant_defaults = '../vagrantdefaults.rb'
load vagrant_defaults if File.exists?(vagrant_defaults) load vagrant_defaults if File.exist?(vagrant_defaults)
defaultOSConfigure(vm) defaultOSConfigure(vm)
addCoverageDir(vm, role, GOCOVER) addCoverageDir(vm, role, GOCOVER)
......
...@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num) ...@@ -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" vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
vagrant_defaults = '../vagrantdefaults.rb' vagrant_defaults = '../vagrantdefaults.rb'
load vagrant_defaults if File.exists?(vagrant_defaults) load vagrant_defaults if File.exist?(vagrant_defaults)
defaultOSConfigure(vm) defaultOSConfigure(vm)
addCoverageDir(vm, role, GOCOVER) addCoverageDir(vm, role, GOCOVER)
......
...@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num) ...@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
node_ip = "#{NETWORK_PREFIX}.#{100+node_num}" node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
vm.network "private_network", ip: node_ip, netmask: "255.255.255.0" 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 = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -17,7 +17,7 @@ def provision(vm, role, role_num, node_num) ...@@ -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 # 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" 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 load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num) ...@@ -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" vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
vagrant_defaults = '../vagrantdefaults.rb' vagrant_defaults = '../vagrantdefaults.rb'
load vagrant_defaults if File.exists?(vagrant_defaults) load vagrant_defaults if File.exist?(vagrant_defaults)
defaultOSConfigure(vm) defaultOSConfigure(vm)
dockerInstall(vm) dockerInstall(vm)
......
...@@ -19,8 +19,8 @@ def provision(vm, roles, role_num, node_num) ...@@ -19,8 +19,8 @@ def provision(vm, roles, role_num, node_num)
node_ip4 = "#{NETWORK4_PREFIX}.#{100+node_num}" node_ip4 = "#{NETWORK4_PREFIX}.#{100+node_num}"
vm.network "private_network", ip: node_ip4, netmask: "255.255.255.0" vm.network "private_network", ip: node_ip4, netmask: "255.255.255.0"
scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" scripts_location = Dir.exist?("./scripts") ? "./scripts" : "../scripts"
vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -18,8 +18,8 @@ def provision(vm, roles, role_num, node_num) ...@@ -18,8 +18,8 @@ def provision(vm, roles, role_num, node_num)
node_ip = "#{NETWORK_PREFIX}.#{100+node_num}" node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
vm.network "private_network", ip: node_ip, netmask: "255.255.255.0" 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 = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -22,8 +22,8 @@ def provision(vm, role, role_num, node_num) ...@@ -22,8 +22,8 @@ def provision(vm, role, role_num, node_num)
node_ip = "#{NETWORK_PREFIX}.#{100+node_num}" node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
vm.network "private_network", ip: node_ip, netmask: "255.255.255.0" 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 = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -25,7 +25,7 @@ def getInstallType(vm, release_version, branch, release_channel='') ...@@ -25,7 +25,7 @@ def getInstallType(vm, release_version, branch, release_channel='')
return "INSTALL_K3S_CHANNEL=#{release_channel}" return "INSTALL_K3S_CHANNEL=#{release_channel}"
else else
jqInstall(vm) 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 # 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 # 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"] vm.provision "Get latest commit", type: "shell", path: scripts_location +"/latest_commit.sh", args: [branch, "/tmp/k3s_commits"]
......
...@@ -24,8 +24,8 @@ def provision(vm, role, role_num, node_num) ...@@ -24,8 +24,8 @@ def provision(vm, role, role_num, node_num)
node_ip = "#{NETWORK_PREFIX}.#{100+node_num}" node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
vm.network "private_network", ip: node_ip, netmask: "255.255.255.0" 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 = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
...@@ -33,8 +33,8 @@ def provision(vm, role, role_num, node_num) ...@@ -33,8 +33,8 @@ def provision(vm, role, role_num, node_num)
node_ip = "#{NETWORK_PREFIX}.#{100+node_num}" node_ip = "#{NETWORK_PREFIX}.#{100+node_num}"
vm.network "private_network", ip: node_ip, netmask: "255.255.255.0" 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 = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" vagrant_defaults = File.exist?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"
load vagrant_defaults load vagrant_defaults
defaultOSConfigure(vm) defaultOSConfigure(vm)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment