diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 865cf14a905c..59da7bff6ea9 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - vm: [centos-7, rocky-8, rocky-9, fedora, opensuse-leap, ubuntu-2204] + vm: [centos-9, rocky-8, rocky-9, fedora, opensuse-leap, ubuntu-2404] max-parallel: 3 defaults: run: @@ -65,7 +65,7 @@ jobs: vagrant ssh -c "sudo mv /tmp/k3s /usr/local/bin/k3s" vagrant provision --provision-with=k3s-upload - name: Add binary to PATH - if: matrix.vm == 'centos-7' || matrix.vm == 'rocky-8' || matrix.vm == 'rocky-9' || matrix.vm == 'opensuse-leap' + if: matrix.vm == 'centos-9' || matrix.vm == 'rocky-8' || matrix.vm == 'rocky-9' || matrix.vm == 'opensuse-leap' run: vagrant provision --provision-with=add-bin-path - name: "⏩ Install K3s" run: | diff --git a/.github/workflows/nightly-install.yaml b/.github/workflows/nightly-install.yaml index c318fb0b3b0a..a721678bf442 100644 --- a/.github/workflows/nightly-install.yaml +++ b/.github/workflows/nightly-install.yaml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: channel: [stable, latest] - vm: [rocky-8, fedora, opensuse-leap, ubuntu-2204] + vm: [rocky-9, fedora, opensuse-leap, ubuntu-2404] max-parallel: 4 defaults: run: diff --git a/tests/install/centos-7/Vagrantfile b/tests/install/centos-9/Vagrantfile similarity index 93% rename from tests/install/centos-7/Vagrantfile rename to tests/install/centos-9/Vagrantfile index f7be36b3a138..b2a5080ced78 100644 --- a/tests/install/centos-7/Vagrantfile +++ b/tests/install/centos-9/Vagrantfile @@ -6,14 +6,14 @@ ENV['TEST_INSTALL_SH'] ||= '../../../install.sh' Vagrant.configure("2") do |config| config.vagrant.plugins = ["vagrant-k3s"] - config.vm.box = "generic/centos7" + config.vm.box = "eurolinux-vagrant/centos-stream-9" config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds config.vm.synced_folder '.', '/vagrant', disabled: true # Load in helper functions load "../install_util.rb" - config.vm.define 'install-centos-7', primary: true do |test| + config.vm.define 'install-centos-9', primary: true do |test| test.vm.hostname = 'smoke' test.vm.provision "add-bin-path", type: "shell", inline: "echo \"export PATH=/usr/local/bin:\$PATH\" >> ~/.bashrc" test.vm.provision 'k3s-upload', type: 'file', run: 'always', source: ENV['TEST_INSTALL_SH'], destination: 'install.sh' diff --git a/tests/install/fedora/Vagrantfile b/tests/install/fedora/Vagrantfile index 5c1c27b3cb9e..99c636cc7299 100644 --- a/tests/install/fedora/Vagrantfile +++ b/tests/install/fedora/Vagrantfile @@ -6,7 +6,7 @@ ENV['TEST_INSTALL_SH'] ||= '../../../install.sh' Vagrant.configure("2") do |config| config.vagrant.plugins = ["vagrant-k3s"] - config.vm.box = 'generic/fedora37' + config.vm.box = 'bento/fedora-latest' config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds config.vm.synced_folder '.', '/vagrant', disabled: true diff --git a/tests/install/rocky-8/Vagrantfile b/tests/install/rocky-8/Vagrantfile index 01ebf86026bb..362829634c12 100644 --- a/tests/install/rocky-8/Vagrantfile +++ b/tests/install/rocky-8/Vagrantfile @@ -6,7 +6,7 @@ ENV['TEST_INSTALL_SH'] ||= '../../../install.sh' Vagrant.configure("2") do |config| config.vagrant.plugins = ["vagrant-k3s"] - config.vm.box = "generic/rocky8" + config.vm.box = "bento/rockylinux-8" config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds config.vm.synced_folder '.', '/vagrant', disabled: true diff --git a/tests/install/rocky-9/Vagrantfile b/tests/install/rocky-9/Vagrantfile index c4e9e8e32357..f38c14995ed1 100644 --- a/tests/install/rocky-9/Vagrantfile +++ b/tests/install/rocky-9/Vagrantfile @@ -7,7 +7,7 @@ ENV['INSTALL_K3S_CHANNEL'] ||= 'testing' Vagrant.configure("2") do |config| config.vagrant.plugins = ["vagrant-k3s"] - config.vm.box = "generic/rocky9" + config.vm.box = "eurolinux-vagrant/rocky-9" config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds config.vm.synced_folder '.', '/vagrant', disabled: true diff --git a/tests/install/ubuntu-2204/Vagrantfile b/tests/install/ubuntu-2404/Vagrantfile similarity index 94% rename from tests/install/ubuntu-2204/Vagrantfile rename to tests/install/ubuntu-2404/Vagrantfile index 48cef4ef36d5..31285d4493f1 100644 --- a/tests/install/ubuntu-2204/Vagrantfile +++ b/tests/install/ubuntu-2404/Vagrantfile @@ -6,14 +6,14 @@ ENV['TEST_INSTALL_SH'] ||= '../../../install.sh' Vagrant.configure("2") do |config| config.vagrant.plugins = ["vagrant-k3s"] - config.vm.box = 'generic/ubuntu2204' + config.vm.box = 'bento/ubuntu-24.04' config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds config.vm.synced_folder '.', '/vagrant', disabled: true # Load in helper functions load "../install_util.rb" - config.vm.define 'install-ubuntu-2204', primary: true do |test| + config.vm.define 'install-ubuntu-2404', primary: true do |test| test.vm.hostname = 'smoke' test.vm.provision 'k3s-upload', type: 'file', run: 'always', source: ENV['TEST_INSTALL_SH'], destination: 'install.sh' test.vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s|