Skip to content

Commit 3a63202

Browse files
authored
Merge pull request #4 from Oefenweb/add-support-for-noble
Add support for Noble
2 parents 16c51f5 + 3bcebbc commit 3a63202

File tree

6 files changed

+40
-26
lines changed

6 files changed

+40
-26
lines changed

.github/workflows/ci.yml

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

5556
steps:
5657
- name: Check out the codebase
@@ -64,8 +65,8 @@ jobs:
6465
python-version: '3.x'
6566

6667
- name: Install test dependencies
67-
run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
68-
68+
run: |
69+
pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
6970
- name: Run Molecule tests
7071
run: |
7172
molecule test

Vagrantfile

Lines changed: 26 additions & 12 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,14 +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-9",
30-
:box => "bento/debian-9",
31-
:ip => '10.0.0.17',
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"
27+
},
28+
{
29+
:name => "ubuntu-2404",
30+
:box => "bento/ubuntu-24.04",
31+
:ip => '10.0.0.16',
32+
:cpu => "50",
33+
:ram => "512"
3434
},
3535
{
3636
:name => "debian-10",
@@ -39,6 +39,20 @@ boxes = [
3939
:cpu => "50",
4040
:ram => "256"
4141
},
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+
},
4256
]
4357

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

meta/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +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-
- stretch
1919
- buster
20+
- bullseye
21+
- bookworm
2022
galaxy_tags:
2123
- development
2224
- 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

vars/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ chrome_repositories:
88
chrome_dependencies_pre:
99
- software-properties-common
1010
- dirmngr
11+
- gpg-agent
1112

1213
chrome_dependencies:
1314
- google-chrome-stable

0 commit comments

Comments
 (0)