Skip to content

Commit e8828e2

Browse files
authored
Merge pull request #4 from Oefenweb/add-support-for-noble
Add support for Noble
2 parents 2d2ea00 + f0d26ef commit e8828e2

File tree

6 files changed

+37
-33
lines changed

6 files changed

+37
-33
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
include:
47-
- distro: debian8
48-
- distro: debian9
4947
- distro: debian10
50-
- distro: ubuntu1604
51-
ansible-version: '>=2.10, <2.11'
52-
- distro: ubuntu1604
48+
- distro: debian11
49+
- distro: debian12
5350
- distro: ubuntu1804
51+
ansible-version: '>=9, <10'
5452
- distro: ubuntu2004
53+
- distro: ubuntu2204
54+
- distro: ubuntu2404
5555

5656
steps:
5757
- name: Check out the codebase
@@ -65,8 +65,8 @@ jobs:
6565
python-version: '3.x'
6666

6767
- name: Install test dependencies
68-
run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
69-
68+
run: |
69+
pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
7070
- name: Run Molecule tests
7171
run: |
7272
molecule test

Vagrantfile

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@
44
role = File.basename(File.expand_path(File.dirname(__FILE__)))
55

66
boxes = [
7-
{
8-
:name => "ubuntu-1604",
9-
:box => "bento/ubuntu-16.04",
10-
:ip => '10.0.0.12',
11-
:cpu => "50",
12-
:ram => "256"
13-
},
147
{
158
:name => "ubuntu-1804",
169
:box => "bento/ubuntu-18.04",
@@ -23,21 +16,21 @@ boxes = [
2316
:box => "bento/ubuntu-20.04",
2417
:ip => '10.0.0.14',
2518
:cpu => "50",
26-
:ram => "384"
19+
:ram => "512"
2720
},
2821
{
29-
:name => "debian-8",
30-
:box => "bento/debian-8",
31-
:ip => '10.0.0.16',
22+
:name => "ubuntu-2204",
23+
:box => "bento/ubuntu-22.04",
24+
:ip => '10.0.0.15',
3225
:cpu => "50",
33-
:ram => "256"
26+
:ram => "512"
3427
},
3528
{
36-
:name => "debian-9",
37-
:box => "bento/debian-9",
38-
:ip => '10.0.0.17',
29+
:name => "ubuntu-2404",
30+
:box => "bento/ubuntu-24.04",
31+
:ip => '10.0.0.16',
3932
:cpu => "50",
40-
:ram => "256"
33+
:ram => "512"
4134
},
4235
{
4336
:name => "debian-10",
@@ -46,6 +39,20 @@ boxes = [
4639
:cpu => "50",
4740
:ram => "256"
4841
},
42+
{
43+
:name => "debian-11",
44+
:box => "bento/debian-11",
45+
:ip => '10.0.0.19',
46+
:cpu => "50",
47+
:ram => "256"
48+
},
49+
{
50+
:name => "debian-12",
51+
:box => "bento/debian-12",
52+
:ip => '10.0.0.20',
53+
:cpu => "50",
54+
:ram => "384"
55+
},
4956
]
5057

5158
Vagrant.configure("2") do |config|

meta/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ galaxy_info:
1010
platforms:
1111
- name: Ubuntu
1212
versions:
13-
- xenial
1413
- bionic
1514
- focal
15+
- jammy
16+
- noble
1617
- name: Debian
1718
versions:
18-
- jessie
19-
- stretch
2019
- buster
20+
- bullseye
21+
- bookworm
2122
galaxy_tags:
2223
- shell
2324
- system

molecule/default/collections.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
---
2-
collections:
3-
- name: community.docker
4-
version: '>=1.2.0,<2'
5-
- name: community.general
6-
version: '>=2,<3'
2+
collections: []

molecule/default/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ driver:
55
name: docker
66
platforms:
77
- name: instance
8-
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
8+
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
99
command: ${MOLECULE_DOCKER_COMMAND:-""}
1010
volumes:
1111
- /sys/fs/cgroup:/sys/fs/cgroup:rw

tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
- gnu-parallel-install
6565
- gnu-parallel-install-build
6666

67-
- name: version check # noqa risky-shell-pipe
67+
- name: version check # noqa risky-shell-pipe command-instead-of-module
6868
ansible.builtin.shell: >
6969
tar -jtf {{ gnu_parallel_download_path }}/{{ gnu_parallel_download_url | basename }} | head -n 1
7070
changed_when: false

0 commit comments

Comments
 (0)