Skip to content

Commit 5a944e7

Browse files
authored
Merge pull request Oefenweb#49 from Oefenweb/fix-failing-build
Fix failing build
2 parents 4a30e93 + 4d0ec2b commit 5a944e7

File tree

5 files changed

+16
-22
lines changed

5 files changed

+16
-22
lines changed

.github/workflows/ci.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@ jobs:
4747
- distro: debian10
4848
- distro: debian11
4949
- distro: debian12
50-
- distro: ubuntu1604
51-
ansible-version: '>=2.10, <2.11'
52-
- distro: ubuntu1604
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

+8-8
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,7 +16,14 @@ 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
{
2929
:name => "debian-10",

meta/main.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# meta file
22
---
33
galaxy_info:
4-
namespace: oefenweb
4+
author: oefenweb
55
role_name: ufw
6-
author: Mischa ter Smitten
76
company: Oefenweb.nl B.V.
87
description: Set up ufw in Debian-like systems
98
license: MIT
109
min_ansible_version: 2.10.0
1110
platforms:
1211
- name: Ubuntu
1312
versions:
14-
- xenial
1513
- bionic
1614
- focal
15+
- jammy
1716
- name: Debian
1817
versions:
1918
- buster

molecule/default/collections.yml

+1-5
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

+1-1
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)