diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 480870fd41..cac9dd2860 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/Dockerfile.dapper b/Dockerfile.dapper index 7b172d1ded..9dea057a4b 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.17.13-alpine3.15 +ARG GOLANG=golang:1.17.13-alpine3.16 FROM ${GOLANG} ARG http_proxy=$http_proxy diff --git a/Dockerfile.manifest b/Dockerfile.manifest index 27da417bc7..1488cd0ac4 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.17.13-alpine3.15 +ARG GOLANG=golang:1.17.13-alpine3.16 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test.dapper b/Dockerfile.test.dapper index 7a164a9006..a9a0971467 100644 --- a/Dockerfile.test.dapper +++ b/Dockerfile.test.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.17.13-alpine3.15 +ARG GOLANG=golang:1.17.13-alpine3.16 FROM ${GOLANG} RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python3 openssl py3-pip procps diff --git a/Dockerfile.test.mod.dapper b/Dockerfile.test.mod.dapper index 84d93234ac..af6083353e 100644 --- a/Dockerfile.test.mod.dapper +++ b/Dockerfile.test.mod.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.17.13-alpine3.15 +ARG GOLANG=golang:1.17.13-alpine3.16 FROM ${GOLANG} RUN apk -U --no-cache add bash jq diff --git a/contrib/util/check-config.sh b/contrib/util/check-config.sh index 3f139fe28b..64346e17a0 100755 --- a/contrib/util/check-config.sh +++ b/contrib/util/check-config.sh @@ -364,6 +364,8 @@ if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then wrap_color '(use "apt-get install apparmor" to fix this)' elif command -v yum &> /dev/null; then wrap_color '(your best bet is "yum install apparmor-parser")' + elif command -v zypper &> /dev/null; then + wrap_color '(your best bet is "zypper install apparmor-parser")' else wrap_color '(look for an "apparmor" package for your distribution)' fi diff --git a/tests/TESTING.md b/tests/TESTING.md index b4f11edda0..e020d8090d 100644 --- a/tests/TESTING.md +++ b/tests/TESTING.md @@ -63,10 +63,11 @@ ___ 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) - - [Leap 15.3](../tests/install/opensuse-microos) (stand-in for SLES) + - [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) - [Control Groups](../tests/cgroup) :arrow_right: on any code change @@ -74,7 +75,7 @@ The sub-directories therein contain fixtures for running simple clusters to asse - [Fedora 35](../tests/cgroup/unified/fedora-35) (rootfull + rootless) - [Snapshotter](../tests/snapshotter/btrfs/opensuse-leap) :arrow_right: on any code change - [BTRFS](../tests/snapshotter/btrfs) ([containerd built-in](https://github.com/containerd/containerd/tree/main/snapshots/btrfs)) - - [Leap 15.3](../tests/snapshotter/btrfs/opensuse-leap) + - [Leap 15.4](../tests/snapshotter/btrfs/opensuse-leap) When adding new installer test(s) please copy the prevalent style for the `Vagrantfile`. Ideally, the boxes used for additional assertions will support the default `virtualbox` provider which 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', diff --git a/tests/install/opensuse-leap/Vagrantfile b/tests/install/opensuse-leap/Vagrantfile index 6b1eeac315..ede7aeb084 100644 --- a/tests/install/opensuse-leap/Vagrantfile +++ b/tests/install/opensuse-leap/Vagrantfile @@ -8,7 +8,7 @@ Vagrant.configure("2") do |config| config.vagrant.plugins = { 'vagrant-k3s' => {:version => '~> 0.1.3'}, } - config.vm.box = 'opensuse/Leap-15.3.x86_64' + config.vm.box = 'opensuse/Leap-15.4.x86_64' config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds config.vm.synced_folder '.', '/vagrant', disabled: true diff --git a/tests/snapshotter/btrfs/opensuse-leap/Vagrantfile b/tests/snapshotter/btrfs/opensuse-leap/Vagrantfile index a979dc3031..9327be92d7 100644 --- a/tests/snapshotter/btrfs/opensuse-leap/Vagrantfile +++ b/tests/snapshotter/btrfs/opensuse-leap/Vagrantfile @@ -8,7 +8,7 @@ Vagrant.configure("2") do |config| config.vagrant.plugins = { 'vagrant-k3s' => {:version => '~> 0.1.3'}, } - config.vm.box = "opensuse/Leap-15.3.x86_64" + config.vm.box = "opensuse/Leap-15.4.x86_64" config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds config.vm.synced_folder '../../../../dist/artifacts', '/vagrant', type: 'rsync', disabled: false, rsync__exclude: ENV['RSYNC_EXCLUDE'] || '*.tar.*'