From d6aa070ed60c52c5d68b90dabe36e5dcf990769f Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 6 Jan 2026 18:09:30 +0100
Subject: [PATCH 1/3] workflow: enable CNCF runners

This should allows to build and run amd64 qemu tests from github
actions.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
 .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 <<EOF
           # export the QEMU_IMAGE_NAME to avoid to download it.
@@ -239,10 +235,7 @@ jobs:
     name: "Merge TAP reports and post results"
     needs: tests
     if: always() && !cancelled()
-    runs-on:
-      - self-hosted
-      - ubuntu
-      - kola
+    runs-on: oracle-vm-32cpu-128gb-x86-64
     permissions:
       pull-requests: write
 
@@ -253,7 +246,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 git bzip2 jq sqlite3
+          sudo apt update && sudo apt install -y ca-certificates curl gnupg lsb-release git bzip2 jq sqlite3
 
       - uses: actions/checkout@v4
         with:

From 94dad21e191bb36fa5413d38c14f541cc9304eff Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 7 Jan 2026 11:06:39 +0100
Subject: [PATCH 2/3] workflow/kola: remove systemctl calls

this is useless on those runners

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
 .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 755e53cc13c5d240b93b8876bc9f5b2157c0383a Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 7 Jan 2026 13:44:39 +0100
Subject: [PATCH 3/3] workflow/kola: make sure iptables and ip are around

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
 .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.