Skip to content

Commit 4a5994b

Browse files
committed
Fix failing tests
1 parent 2d714df commit 4a5994b

File tree

5 files changed

+29
-34
lines changed

5 files changed

+29
-34
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ 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
5554

5655
steps:
5756
- name: Check out the codebase
@@ -65,8 +64,8 @@ jobs:
6564
python-version: '3.x'
6665

6766
- name: Install test dependencies
68-
run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
69-
67+
run: |
68+
pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
7069
- name: Run Molecule tests
7170
run: |
7271
molecule test

Vagrantfile

Lines changed: 17 additions & 17 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,26 +16,33 @@ boxes = [
2316
:box => "bento/ubuntu-20.04",
2417
:ip => '10.0.0.14',
2518
:cpu => "50",
26-
:ram => "384"
19+
:ram => "512"
20+
},
21+
{
22+
:name => "ubuntu-2204",
23+
:box => "bento/ubuntu-22.04",
24+
:ip => '10.0.0.15',
25+
:cpu => "50",
26+
:ram => "512"
2727
},
2828
{
29-
:name => "debian-8",
30-
:box => "bento/debian-8",
31-
:ip => '10.0.0.16',
29+
:name => "debian-10",
30+
:box => "bento/debian-10",
31+
:ip => '10.0.0.18',
3232
:cpu => "50",
3333
:ram => "256"
3434
},
3535
{
36-
:name => "debian-9",
37-
:box => "bento/debian-9",
38-
:ip => '10.0.0.17',
36+
:name => "debian-11",
37+
:box => "bento/debian-11",
38+
:ip => '10.0.0.19',
3939
:cpu => "50",
4040
:ram => "256"
4141
},
4242
{
43-
:name => "debian-10",
44-
:box => "bento/debian-10",
45-
:ip => '10.0.0.18',
43+
:name => "debian-12",
44+
:box => "bento/debian-12",
45+
:ip => '10.0.0.20',
4646
:cpu => "50",
4747
:ram => "256"
4848
},

meta/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ galaxy_info:
1010
platforms:
1111
- name: Ubuntu
1212
versions:
13-
- trusty
14-
- xenial
1513
- bionic
14+
- focal
15+
- jammy
1616
- name: Debian
1717
versions:
18-
- jessie
19-
- stretch
2018
- buster
19+
- bullseye
20+
- bookworm
2121
galaxy_tags:
2222
- development
2323
- 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

0 commit comments

Comments
 (0)