From ebd211a21924c6a13a8474d3c0b158add339e158 Mon Sep 17 00:00:00 2001
From: Tim Zhou <tizhou@redhat.com>
Date: Wed, 3 Jun 2026 15:44:33 -0400
Subject: [PATCH] ci: switch self-hosted runners from Oracle to CNCF Ubuntu

The Oracle VM runners are being retired. Migrate the four self-hosted
jobs (validate, doccheck, test_skopeo, ostree_rs_ext) to the equivalent
CNCF Ubuntu runner sizes, and update the actionlint allowlist to match.

Size mapping:
  oracle-vm-2cpu-8gb-x86-64  -> cncf-ubuntu-2-8-x86  (test_skopeo)
  oracle-vm-4cpu-16gb-x86-64 -> cncf-ubuntu-4-16-x86 (validate,
                                                      doccheck,
                                                      ostree_rs_ext)

Signed-off-by: Tim Zhou <tizhou@redhat.com>
---
 .github/actionlint.yaml  | 12 ++++++------
 .github/workflows/ci.yml |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index 8a8916d45..5f0459c3a 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -1,8 +1,8 @@
 self-hosted-runner:
   labels:
-    - oracle-vm-2cpu-8gb-x86-64
-    - oracle-vm-4cpu-16gb-x86-64
-    - oracle-vm-8cpu-32gb-x86-64
-    - oracle-vm-16cpu-64gb-x86-64
-    - oracle-vm-24cpu-96gb-x86-64
-    - oracle-vm-32cpu-128gb-x86-64
+    - cncf-ubuntu-2-8-x86
+    - cncf-ubuntu-4-16-x86
+    - cncf-ubuntu-8-32-x86
+    - cncf-ubuntu-16-64-x86
+    - cncf-ubuntu-24-96-x86
+    - cncf-ubuntu-32-128-x86
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 073851523..164aeae34 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
           filters: .github/filters.yaml
 
   validate:
-    runs-on: oracle-vm-4cpu-16gb-x86-64
+    runs-on: cncf-ubuntu-4-16-x86
     timeout-minutes: 45
     container:
       image: quay.io/libpod/skopeo_cidev:c20260310t170224z-f43f42d14 # FIXME: Should be Renovate-managed.
@@ -49,7 +49,7 @@ jobs:
 
   doccheck:
     needs: validate
-    runs-on: oracle-vm-4cpu-16gb-x86-64
+    runs-on: cncf-ubuntu-4-16-x86
     timeout-minutes: 45
     container:
       image: quay.io/libpod/skopeo_cidev:c20260310t170224z-f43f42d14 # FIXME: Should be Renovate-managed.
@@ -118,7 +118,7 @@ jobs:
     if: >-
       !contains(github.event.pull_request.title || github.event.head_commit.message, '[CI:DOCS]')
       && !contains(github.event.pull_request.title || github.event.head_commit.message, '[CI:BUILD]')
-    runs-on: oracle-vm-2cpu-8gb-x86-64
+    runs-on: cncf-ubuntu-2-8-x86
     timeout-minutes: 45
     name: test_skopeo / ${{ matrix.name }}
     strategy:
@@ -156,7 +156,7 @@ jobs:
       && (github.event_name != 'pull_request'
           || needs.path-filter.outputs.all == 'true'
           || needs.path-filter.outputs.code == 'true')
-    runs-on: oracle-vm-4cpu-16gb-x86-64
+    runs-on: cncf-ubuntu-4-16-x86
     timeout-minutes: 45
     container:
       image: quay.io/coreos-assembler/fcos-buildroot:testing-devel