Browse Source

Bump testing to opensuse Leap 15.4 (#6337)

* Bump to Leap 15.4 for testing

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/6334/head
Derek Nola 2 years ago committed by GitHub
parent
commit
fd79a1cfea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      contrib/util/check-config.sh
  2. 4
      tests/TESTING.md
  3. 2
      tests/install/opensuse-leap/Vagrantfile
  4. 2
      tests/snapshotter/btrfs/opensuse-leap/Vagrantfile

2
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

4
tests/TESTING.md

@ -66,7 +66,7 @@ The sub-directories therein contain fixtures for running simple clusters to asse
- [Install Script](../tests/install) :arrow_right: on proposed changes to [install.sh](../install.sh)
- [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)
- [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 +74,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

2
tests/install/opensuse-leap/Vagrantfile vendored

@ -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

2
tests/snapshotter/btrfs/opensuse-leap/Vagrantfile vendored

@ -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.*'

Loading…
Cancel
Save