From 9a9f1f2d5eefff13f60fdcb7182149fcb9456f75 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Thu, 27 Oct 2022 08:11:57 -0700 Subject: [PATCH] Replace fedora-coreos with fedora 36 for install tests (#6315) * Move to fedora 36 on install tests Signed-off-by: Derek Nola --- .github/workflows/install.yaml | 2 +- tests/TESTING.md | 3 ++- tests/install/{fedora-coreos => fedora}/Vagrantfile | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) rename tests/install/{fedora-coreos => fedora}/Vagrantfile (95%) diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 9ad0232302..f2b10232a6 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false 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 defaults: run: diff --git a/tests/TESTING.md b/tests/TESTING.md index 8e59781557..e020d8090d 100644 --- a/tests/TESTING.md +++ b/tests/TESTING.md @@ -63,9 +63,10 @@ ___ 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: -- [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) - [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) - [MicroOS](../tests/install/opensuse-microos) (stand-in for SLE-Micro) - [Ubuntu 20.04](../tests/install/ubuntu-focal) (Focal Fossa) diff --git a/tests/install/fedora-coreos/Vagrantfile b/tests/install/fedora/Vagrantfile similarity index 95% rename from tests/install/fedora-coreos/Vagrantfile rename to tests/install/fedora/Vagrantfile index bec0ea97ac..9d4e6cdd9a 100644 --- a/tests/install/fedora-coreos/Vagrantfile +++ b/tests/install/fedora/Vagrantfile @@ -8,15 +8,16 @@ Vagrant.configure("2") do |config| config.vagrant.plugins = { '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.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.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-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.env = ENV.select{|k,v| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({ :INSTALL_K3S_NAME => 'server',