From f17f46c62753438bf327c40a516a99f1bf8840b8 Mon Sep 17 00:00:00 2001
From: Dmitry Anoshin <anoshindx@gmail.com>
Date: Tue, 14 Jan 2025 18:25:59 -0800
Subject: [PATCH] [chore] Upgrade CI workers for ansible tests

---
 .github/workflows/ansible.yml                  | 10 ++++------
 deployments/ansible/molecule/config/docker.yml |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index a076865425..7fb43e5880 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -36,8 +36,7 @@ jobs:
 
   lint:
     name: Lint
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -56,8 +55,8 @@ jobs:
   linux-test:
     name: Linux Test
     needs: lint
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    # Use ubuntu-20.04.5 for containers with cgroups v1. Otherwise, use ubuntu-24.04 (cgroups v2).
+    runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "opensuse12", "ubuntu1604"]'), matrix.distro)] }}
     strategy:
       fail-fast: false
       matrix:
@@ -196,8 +195,7 @@ jobs:
   push-release-tag:
     name: Push Release Tag
     needs: lint
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.ref == 'refs/heads/main' 
     steps:
       - name: Checkout
diff --git a/deployments/ansible/molecule/config/docker.yml b/deployments/ansible/molecule/config/docker.yml
index f7a8060cf0..f0bd6f090e 100644
--- a/deployments/ansible/molecule/config/docker.yml
+++ b/deployments/ansible/molecule/config/docker.yml
@@ -14,7 +14,7 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
-    cgroupns: host
+    cgroupns_mode: host
     pre_build_image: false
 
 provisioner: