From 9683f00134324a4e62f68a316dbef46d39dbb680 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Mon, 3 Jun 2024 15:41:53 -0700 Subject: [PATCH 1/8] fix: support >ubuntu 22.04 --- defaults/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 42f07b7..5ce884a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -21,11 +21,10 @@ essential_packages_common: - bc - screen - jq - - mlocate - net-tools + - "{{ (ansible_distribution_major_version|int < 22) | ternary('mlocate', 'plocate') }}" basic_packages_redhat: "{{ essential_packages_common + essential_packages_redhat_only }}" - basic_packages_ubuntu: "{{ essential_packages_common + essential_packages_ubuntu_only }}" set_bash_history_timestamps: true From f4268cd9fe666e9d1b4d3ec8c822aff391d56add Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Mon, 3 Jun 2024 15:42:13 -0700 Subject: [PATCH 2/8] fix: add 2204 and 2404 tests --- .github/workflows/molecule.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 642c88b..2123838 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -27,9 +27,10 @@ jobs: strategy: matrix: image: + - geerlingguy/docker-ubuntu2404-ansible:latest + - geerlingguy/docker-ubuntu2204-ansible:latest - geerlingguy/docker-ubuntu2004-ansible:latest - geerlingguy/docker-ubuntu1804-ansible:latest - - geerlingguy/docker-ubuntu1604-ansible:latest - geerlingguy/docker-centos8-ansible:latest - geerlingguy/docker-centos7-ansible:latest steps: From a2f91ed2e951b74dfe3fbd4c1fe473aa6af955d8 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Mon, 3 Jun 2024 15:42:18 -0700 Subject: [PATCH 3/8] fix: molecule changes --- molecule/default/molecule.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index e3ce9d4..43992e5 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -7,10 +7,15 @@ platforms: - name: instance image: ${MOLECULE_DOCKER_IMAGE:-'geerlingguy/docker-ubuntu1804-ansible:latest'} command: ${MOLECULE_DOCKER_COMMAND:-""} + cgroupns: host volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw privileged: true pre_build_image: true + tmpfs: + - /tmp + - /run + - /run/lock provisioner: name: ansible playbooks: From 26d60470972baf1d17c49e7f4a45b927cc86c54c Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Mon, 3 Jun 2024 15:52:22 -0700 Subject: [PATCH 4/8] fix: meta versions --- meta/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/main.yml b/meta/main.yml index be09fcf..641b843 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -12,9 +12,14 @@ galaxy_info: - trusty - xenial - bionic + - focal + - jammy + - noble - name: EL versions: - 6 + - 7 + - 8 galaxy_tags: [] dependencies: [] From 6e6ce4b007863c228962012a120f84ab3b1f8fa8 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Mon, 3 Jun 2024 15:57:19 -0700 Subject: [PATCH 5/8] fix: remote tmp --- molecule/default/molecule.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 43992e5..fc6a5ac 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -20,3 +20,7 @@ provisioner: name: ansible playbooks: converge: ${MOLECULE_PLAYBOOK:-converge.yml} + config_options: + defaults: + verbosity: ${MOLECULE_VERBOSITY:-0} + remote_tmp: /tmp From bcf3cea5519be1d3c8d952d190d40708061bf795 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Mon, 3 Jun 2024 16:20:01 -0700 Subject: [PATCH 6/8] fix: property name --- molecule/default/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index fc6a5ac..11e7d85 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -7,7 +7,7 @@ platforms: - name: instance image: ${MOLECULE_DOCKER_IMAGE:-'geerlingguy/docker-ubuntu1804-ansible:latest'} command: ${MOLECULE_DOCKER_COMMAND:-""} - cgroupns: host + cgroupns_mode: host volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw privileged: true From dba41623047baede02bc25aff13c8eed2a737577 Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Mon, 3 Jun 2024 16:35:16 -0700 Subject: [PATCH 7/8] fix: newer molecule --- .github/workflows/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 2123838..27097e8 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -39,7 +39,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 From 029c3eeca7577eaffbc2a3ad4f1fb01447399d1e Mon Sep 17 00:00:00 2001 From: Jaden Seniuk Date: Mon, 3 Jun 2024 16:47:53 -0700 Subject: [PATCH 8/8] fix: no role name check --- molecule/default/molecule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 11e7d85..a6ef38c 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -1,4 +1,5 @@ --- +role_name_check: 1 dependency: name: galaxy driver: