From ec35eee247f3743fcc34d82b49c9e636b017ad35 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 6 Jan 2026 18:09:30 +0100 Subject: [PATCH 1/4] workflow: enable CNCF runners This should allows to build and run amd64 qemu tests from github actions. Signed-off-by: Mathieu Tortuyaux --- .github/workflows/ci.yaml | 6 +----- .github/workflows/run-kola-tests.yaml | 19 ++++++------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a8d23875143..f58e60f0446 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,11 +34,7 @@ permissions: jobs: packages: name: "Build Flatcar packages" - runs-on: - - self-hosted - - ubuntu - - build - - amd64 + runs-on: oracle-vm-32cpu-128gb-x86-64 strategy: fail-fast: false matrix: diff --git a/.github/workflows/run-kola-tests.yaml b/.github/workflows/run-kola-tests.yaml index 22002dbde14..7541dbe4076 100644 --- a/.github/workflows/run-kola-tests.yaml +++ b/.github/workflows/run-kola-tests.yaml @@ -17,15 +17,11 @@ on: jobs: tests: name: "Run Kola tests" - runs-on: - - self-hosted - - ubuntu - - kola - - ${{ matrix.arch }} + runs-on: oracle-vm-32cpu-128gb-x86-64 strategy: fail-fast: false matrix: - arch: ["amd64", "arm64"] + arch: ["amd64"] steps: - name: Prepare machine @@ -34,7 +30,7 @@ jobs: run: | sudo rm /bin/sh sudo ln -s /bin/bash /bin/sh - sudo apt-get install -y ca-certificates curl gnupg lsb-release qemu-system git bzip2 jq dnsmasq python3 zstd + sudo apt update && sudo apt install -y ca-certificates curl gnupg lsb-release qemu-system git bzip2 jq dnsmasq python3 zstd sudo systemctl stop dnsmasq sudo systemctl mask dnsmasq @@ -186,7 +182,7 @@ jobs: source ci-automation/test.sh - PARALLEL_ARCH=10 + PARALLEL_ARCH=5 cat > sdk_container/.env < Date: Wed, 7 Jan 2026 11:06:39 +0100 Subject: [PATCH 2/4] workflow/kola: remove systemctl calls this is useless on those runners Signed-off-by: Mathieu Tortuyaux --- .github/workflows/run-kola-tests.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/run-kola-tests.yaml b/.github/workflows/run-kola-tests.yaml index 7541dbe4076..81e461773eb 100644 --- a/.github/workflows/run-kola-tests.yaml +++ b/.github/workflows/run-kola-tests.yaml @@ -31,8 +31,6 @@ jobs: sudo rm /bin/sh sudo ln -s /bin/bash /bin/sh sudo apt update && sudo apt install -y ca-certificates curl gnupg lsb-release qemu-system git bzip2 jq dnsmasq python3 zstd - sudo systemctl stop dnsmasq - sudo systemctl mask dnsmasq # Set up MASQUERADE. Don't care much to secure it. # This is needed for the VMs kola spins up to have internet access. From 81b9dde509fd3959003935d252c1f498d100cfde Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 7 Jan 2026 13:44:39 +0100 Subject: [PATCH 3/4] workflow/kola: make sure iptables and ip are around Signed-off-by: Mathieu Tortuyaux --- .github/workflows/run-kola-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-kola-tests.yaml b/.github/workflows/run-kola-tests.yaml index 81e461773eb..46d7d5442a3 100644 --- a/.github/workflows/run-kola-tests.yaml +++ b/.github/workflows/run-kola-tests.yaml @@ -30,7 +30,7 @@ jobs: run: | sudo rm /bin/sh sudo ln -s /bin/bash /bin/sh - sudo apt update && sudo apt install -y ca-certificates curl gnupg lsb-release qemu-system git bzip2 jq dnsmasq python3 zstd + sudo apt update && sudo apt install -y ca-certificates curl gnupg lsb-release qemu-system git bzip2 jq dnsmasq python3 zstd iproute2 iptables # Set up MASQUERADE. Don't care much to secure it. # This is needed for the VMs kola spins up to have internet access. From 385d58857c4943a04616ca005d75ab764af5a84d Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 9 Feb 2026 15:09:32 +0100 Subject: [PATCH 4/4] tmp: remove the copy from bincache to use existing sysexts Signed-off-by: Mathieu Tortuyaux --- ci-automation/vms.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ci-automation/vms.sh b/ci-automation/vms.sh index 26f98ee4e15..e226709c099 100644 --- a/ci-automation/vms.sh +++ b/ci-automation/vms.sh @@ -118,14 +118,14 @@ function _vm_build_impl() { done # Download prebuilt OEM sysexts - source build_library/oem_sysexts.sh - local -a oem_ids - get_oem_id_list "${arch}" oem_ids - local oem_id name - for oem_id in "${oem_ids[@]}"; do - name="oem-${oem_id}" - copy_from_buildcache "images/${arch}/${vernum}/${name}.raw" "${images_in}" - done + # source build_library/oem_sysexts.sh + # local -a oem_ids + # get_oem_id_list "${arch}" oem_ids + # local oem_id name + # for oem_id in "${oem_ids[@]}"; do + # name="oem-${oem_id}" + # copy_from_buildcache "images/${arch}/${vernum}/${name}.raw" "${images_in}" + # done lbunzip2 "${images_in}/flatcar_production_image.bin.bz2" ./run_sdk_container -x ./ci-cleanup.sh -n "${vms_container}" -C "${packages_image}" \