Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Release 1.30] Fix e2e test bug in mixedosbgp #6844

Merged
merged 1 commit into from
Sep 26, 2024
Merged

[Release 1.30] Fix e2e test bug in mixedosbgp #6844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions tests/e2e/mixedosbgp/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def provision(vm, role, role_num, node_num)
install_type = "Version=#{RELEASE_VERSION}"
else
vm.provision "shell", path: "../scripts/latest_commit.ps1", args: [GITHUB_BRANCH, "./rke2_commits.txt"]
install_type = "-Commit=(Get-Content -TotalCount 1 ./rke2_commits.txt)"
install_type = "-Commit (Get-Content -TotalCount 1 ./rke2_commits.txt)"
end
else
if !RELEASE_VERSION.empty?
Expand Down Expand Up @@ -89,16 +89,6 @@ def provision(vm, role, role_num, node_num)
puts "invalid box: " + vm.box + " found for windows agent"
abort
end

# For Windows GUI on virtualbox
# vm.provider "virtualbox" do |v|
# v.gui = true
# v.customize ["modifyvm", :id, "--vram", 128]
# v.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
# v.customize ["modifyvm", :id, "--accelerate3d", "on"]
# v.customize ["modifyvm", :id, "--accelerate2dvideo", "on"]
# end
# If using libvirt, use virt-viewer for GUI after bring up the node
vm.provision :rke2, run: 'once' do |rke2|
rke2.env = install_type
rke2.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
Expand Down