From b274999159b598fc26dcb9bbb387a21184e222d8 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Tue, 4 Jun 2024 09:45:46 -0700 Subject: [PATCH 1/4] fix: update actions --- .github/workflows/molecule.yml | 4 +++- molecule/default/molecule.yml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 527025e..b6c3d4e 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -27,6 +27,8 @@ jobs: strategy: matrix: image: + - geerlingguy/docker-ubuntu2404-ansible:latest + - geerlingguy/docker-ubuntu2204-ansible:latest - geerlingguy/docker-ubuntu2004-ansible:latest steps: - name: checkout @@ -34,7 +36,7 @@ jobs: with: path: "${{ github.repository }}" - name: molecule - uses: robertdebock/molecule-action@2.6.3 + uses: robertdebock/molecule-action@6.0.1 with: image: "${{ matrix.image }}" options: parallel diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index bbd6390..84c7122 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -7,8 +7,9 @@ platforms: - name: instance image: ${MOLECULE_DOCKER_IMAGE:-'geerlingguy/docker-ubuntu2004-ansible:latest'} command: ${MOLECULE_DOCKER_COMMAND:-""} + cgroupns_mode: host volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw privileged: true pre_build_image: true provisioner: From 4b00c8c3a1e1ef33155dcce9785442678c1e3080 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Tue, 4 Jun 2024 09:51:58 -0700 Subject: [PATCH 2/4] fix: no env property --- .github/workflows/molecule.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index b6c3d4e..532db71 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -40,5 +40,3 @@ jobs: with: image: "${{ matrix.image }}" options: parallel - env: - MOLECULE_DOCKER_IMAGE: "${{ matrix.image }}" From b4745ccdd5bb38be5224f9c5e0f7fb1147f878c8 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Tue, 4 Jun 2024 09:58:15 -0700 Subject: [PATCH 3/4] fix: move env --- molecule/default/molecule.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 84c7122..f335e6e 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -16,8 +16,8 @@ provisioner: name: ansible playbooks: converge: ${MOLECULE_PLAYBOOK:-converge.yml} + env: + PY_COLORS: '1' + ANSIBLE_FORCE_COLOR: '1' verifier: name: ansible -env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' From 3f70868a41e87388b4be2756ffff2940e3a98c9b Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Tue, 4 Jun 2024 10:08:08 -0700 Subject: [PATCH 4/4] fix: right image --- .github/workflows/molecule.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 532db71..b6c3d4e 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -40,3 +40,5 @@ jobs: with: image: "${{ matrix.image }}" options: parallel + env: + MOLECULE_DOCKER_IMAGE: "${{ matrix.image }}"