From 0a097615c0c651666929f5ad875d473c2bc8c34a Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 28 Oct 2020 20:07:19 +0900 Subject: [PATCH 1/2] CI: update Fedora to 33 Signed-off-by: Akihiro Suda --- .travis.yml | 4 ++-- Vagrantfile.fedora32 => Vagrantfile.fedora33 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename Vagrantfile.fedora32 => Vagrantfile.fedora33 (97%) diff --git a/.travis.yml b/.travis.yml index 29f250e9e..ea17f2a94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,10 @@ jobs: script: - make all - sudo PATH="$PATH" make localintegration RUNC_USE_SYSTEMD=1 - - name: "fedora32" + - name: "fedora33" before_install: - sudo ./script/install-vagrant.sh - - ln -sf Vagrantfile.fedora32 Vagrantfile + - ln -sf Vagrantfile.fedora33 Vagrantfile - sudo vagrant up && sudo mkdir -p /root/.ssh && sudo sh -c "vagrant ssh-config >> /root/.ssh/config" script: - sudo ssh default -t 'cd /vagrant && sudo make localunittest' diff --git a/Vagrantfile.fedora32 b/Vagrantfile.fedora33 similarity index 97% rename from Vagrantfile.fedora32 rename to Vagrantfile.fedora33 index b72954abd..6e4a63145 100644 --- a/Vagrantfile.fedora32 +++ b/Vagrantfile.fedora33 @@ -3,7 +3,7 @@ Vagrant.configure("2") do |config| # Fedora box is used for testing cgroup v2 support - config.vm.box = "fedora/32-cloud-base" + config.vm.box = "fedora/33-cloud-base" config.vm.provider :virtualbox do |v| v.memory = 2048 v.cpus = 2 From 9403afd75c327de2128cbfca20b0ba399b3e3748 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 28 Oct 2020 20:13:19 +0900 Subject: [PATCH 2/2] CI: Fedora 33: print kernel version, systemd version, and rootfs type Signed-off-by: Akihiro Suda --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ea17f2a94..f62f269d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ jobs: - ln -sf Vagrantfile.fedora33 Vagrantfile - sudo vagrant up && sudo mkdir -p /root/.ssh && sudo sh -c "vagrant ssh-config >> /root/.ssh/config" script: + - sudo ssh default 'sh -exc "uname -a && systemctl --version && df -T"' - sudo ssh default -t 'cd /vagrant && sudo make localunittest' # cgroupv2+systemd: test on vagrant host itself as we need systemd - sudo ssh default -t 'cd /vagrant && sudo make localintegration RUNC_USE_SYSTEMD=yes'