Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace fedora-coreos with fedora 36 for install tests (#6315)

Browse Source 
* Move to fedora 36 on install tests

Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola 2022-10-27 08:11:57 -07:00 committed by GitHub
parent 44b12c02f2
commit 9a9f1f2d5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/install.yaml vendored
View File

@ -37,7 +37,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
vm: [centos-7, rocky-8, fedora-coreos, opensuse-leap, opensuse-microos, ubuntu-focal] vm: [centos-7, rocky-8, fedora, opensuse-leap, opensuse-microos, ubuntu-focal]
max-parallel: 2 max-parallel: 2
defaults: defaults:
run: run:

3
tests/TESTING.md
View File

@ -63,9 +63,10 @@ ___
Smoke tests are a collection of tests defined under the [tests](../tests) path at the root of this repository. Smoke tests are a collection of tests defined under the [tests](../tests) path at the root of this repository.
The sub-directories therein contain fixtures for running simple clusters to assert correct behavior for "happy path" scenarios. These fixtures are mostly self-contained Vagrantfiles describing single-node installations that are easily spun up with Vagrant for the `libvirt` and `virtualbox` providers: The sub-directories therein contain fixtures for running simple clusters to assert correct behavior for "happy path" scenarios. These fixtures are mostly self-contained Vagrantfiles describing single-node installations that are easily spun up with Vagrant for the `libvirt` and `virtualbox` providers:
- [Install Script](../tests/install) :arrow_right: on proposed changes to [install.sh](../install.sh) - [Install Script](../tests/install) :arrow_right: scheduled nightly
- [CentOS 7](../tests/install/centos-7) (stand-in for RHEL 7) - [CentOS 7](../tests/install/centos-7) (stand-in for RHEL 7)
- [Rocky Linux 8](../tests/install/rocky-8) (stand-in for RHEL 8) - [Rocky Linux 8](../tests/install/rocky-8) (stand-in for RHEL 8)
- [Fedora](../tests/install/fedora)
- [Leap 15.4](../tests/install/opensuse-leap) (stand-in for SLES) - [Leap 15.4](../tests/install/opensuse-leap) (stand-in for SLES)
- [MicroOS](../tests/install/opensuse-microos) (stand-in for SLE-Micro) - [MicroOS](../tests/install/opensuse-microos) (stand-in for SLE-Micro)
- [Ubuntu 20.04](../tests/install/ubuntu-focal) (Focal Fossa) - [Ubuntu 20.04](../tests/install/ubuntu-focal) (Focal Fossa)

7
tests/install/fedora-coreos/Vagrantfile → tests/install/fedora/Vagrantfile vendored
View File

@ -8,15 +8,16 @@ Vagrant.configure("2") do |config|
config.vagrant.plugins = { config.vagrant.plugins = {
'vagrant-k3s' => {:version => '~> 0.1.3'}, 'vagrant-k3s' => {:version => '~> 0.1.3'},
} }
config.vm.box = 'dhml/fedora-coreos-34.20210725.3.0-20210813' config.vm.box = 'generic/fedora36'
config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds
config.vm.synced_folder '.', '/vagrant', disabled: true config.vm.synced_folder '.', '/vagrant', disabled: true
config.vm.define 'install-fedora-coreos', primary: true do |test| config.vm.define 'install-fedora', primary: true do |test|
test.vm.hostname = 'smoke' test.vm.hostname = 'smoke'
test.vm.provision "disable-firewall", type: "shell", inline: "systemctl stop firewalld"
test.vm.provision 'k3s-upload', type: 'file', run: 'always', source: ENV['TEST_INSTALL_SH'], destination: 'install.sh' 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| test.vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s|
k3s.installer_url = 'file:///var/home/core/install.sh' k3s.installer_url = 'file:///home/vagrant/install.sh'
k3s.args = %w[server] k3s.args = %w[server]
k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({ k3s.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({
:INSTALL_K3S_NAME => 'server', :INSTALL_K3S_NAME => 'server',