From be03bb0830b8f281031086ba0364b8e2824406b1 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 8 Oct 2024 02:34:07 +0900 Subject: [PATCH 1/3] CI: update Fedora to 40 Signed-off-by: Akihiro Suda --- hack/ci/Vagrantfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hack/ci/Vagrantfile b/hack/ci/Vagrantfile index ea5774ebf3..ee421dd596 100644 --- a/hack/ci/Vagrantfile +++ b/hack/ci/Vagrantfile @@ -3,9 +3,7 @@ # Vagrant box for testing kind with non-Ubuntu Vagrant.configure("2") do |config| - config.vm.box = "fedora/39-cloud-base" - # https://mirrormanager.fedoraproject.org/mirrors/Fedora/39/x86_64 - config.vm.box_url = "https://gsl-syd.mm.fcix.net/fedora/linux/releases/39/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-39-1.5.x86_64.vagrant-virtualbox.box" + config.vm.box = "fedora/40-cloud-base" # assume some ram is needed for the host environment but very little CPU memory = 10240 cpus = 3 From 390024b5636e0c0c9684cb3bc3b9deb6bcbe223f Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 8 Oct 2024 02:39:44 +0900 Subject: [PATCH 2/3] CI: VM: use Ubuntu 24.04 hosts Signed-off-by: Akihiro Suda --- .github/workflows/vm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vm.yaml b/.github/workflows/vm.yaml index f784c4ed06..30775e98c0 100644 --- a/.github/workflows/vm.yaml +++ b/.github/workflows/vm.yaml @@ -15,7 +15,7 @@ jobs: vm: # Fedora is different from Ubuntu in LSM (SELinux), filesystem (btrfs), kernel version, etc. name: "CGroupv2 (Fedora)" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 30 strategy: fail-fast: false From abbaec5c8f4b5f4af7f6916bd7e801a08255e216 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 8 Oct 2024 03:41:09 +0900 Subject: [PATCH 3/3] CI: VM: reduce VM resources Signed-off-by: Akihiro Suda --- hack/ci/Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/ci/Vagrantfile b/hack/ci/Vagrantfile index ee421dd596..f04769f12b 100644 --- a/hack/ci/Vagrantfile +++ b/hack/ci/Vagrantfile @@ -5,8 +5,8 @@ Vagrant.configure("2") do |config| config.vm.box = "fedora/40-cloud-base" # assume some ram is needed for the host environment but very little CPU - memory = 10240 - cpus = 3 + memory = 4096 + cpus = 2 config.vm.provider :virtualbox do |v| v.memory = memory v.cpus = cpus