Skip to content

Commit 34ffda7

Browse files
authored
[chore] Upgrade CI workers for ansible tests (#5737)
1 parent 435b440 commit 34ffda7

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/ansible.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ jobs:
3636

3737
lint:
3838
name: Lint
39-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
40-
runs-on: ubuntu-20.04
39+
runs-on: ubuntu-24.04
4140
steps:
4241
- name: Check out the codebase.
4342
uses: actions/checkout@v4
@@ -56,8 +55,8 @@ jobs:
5655
linux-test:
5756
name: Linux Test
5857
needs: lint
59-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
60-
runs-on: ubuntu-20.04
58+
# Use ubuntu-20.04.5 for containers with cgroups v1. Otherwise, use ubuntu-24.04 (cgroups v2).
59+
runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "opensuse12", "ubuntu1604"]'), matrix.distro)] }}
6160
strategy:
6261
fail-fast: false
6362
matrix:
@@ -194,8 +193,7 @@ jobs:
194193
push-release-tag:
195194
name: Push Release Tag
196195
needs: lint
197-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
198-
runs-on: ubuntu-20.04
196+
runs-on: ubuntu-24.04
199197
if: github.ref == 'refs/heads/main'
200198
steps:
201199
- name: Checkout

deployments/ansible/molecule/config/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ platforms:
1414
volumes:
1515
- /sys/fs/cgroup:/sys/fs/cgroup:rw
1616
privileged: true
17-
cgroupns: host
17+
cgroupns_mode: host
1818
pre_build_image: false
1919

2020
provisioner:

0 commit comments

Comments
 (0)