Skip to content

Commit 3469787

Browse files
Python2 is not supported anymore.
1 parent 68d9d78 commit 3469787

File tree

6 files changed

+19
-27
lines changed

6 files changed

+19
-27
lines changed

.github/workflows/molecule.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,12 @@ jobs:
3131
config:
3232
- image: "alpine"
3333
tag: "latest"
34-
- image: "amazonlinux"
35-
tag: "1"
3634
- image: "amazonlinux"
3735
tag: "latest"
3836
- image: "debian"
3937
tag: "latest"
4038
- image: "debian"
4139
tag: "bullseye"
42-
- image: "enterpriselinux"
43-
tag: "8"
4440
- image: "enterpriselinux"
4541
tag: "latest"
4642
- image: "fedora"
@@ -49,8 +45,6 @@ jobs:
4945
tag: "latest"
5046
- image: "fedora"
5147
tag: "rawhide"
52-
- image: "opensuse"
53-
tag: "latest"
5448
- image: "ubuntu"
5549
tag: "latest"
5650
- image: "ubuntu"
@@ -60,10 +54,19 @@ jobs:
6054
steps:
6155
- name: checkout
6256
uses: actions/checkout@v4
57+
58+
- name: Set up Python 3.
59+
uses: actions/setup-python@v5
6360
with:
64-
path: "${{ github.repository }}"
61+
python-version: '3.x'
62+
63+
- name: Install dependencies
64+
run: |
65+
python -m pip install --upgrade pip
66+
pip install -r requirements.txt
67+
6568
- name: molecule
66-
uses: robertdebock/molecule[email protected]
67-
with:
69+
run: molecule converge
70+
env:
6871
image: ${{ matrix.config.image }}
6972
tag: ${{ matrix.config.tag }}

.gitlab-ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,12 @@ molecule:
1414
matrix:
1515
- image: "alpine"
1616
tag: "latest"
17-
- image: "amazonlinux"
18-
tag: "1"
1917
- image: "amazonlinux"
2018
tag: "latest"
2119
- image: "debian"
2220
tag: "latest"
2321
- image: "debian"
2422
tag: "bullseye"
25-
- image: "enterpriselinux"
26-
tag: "8"
2723
- image: "enterpriselinux"
2824
tag: "latest"
2925
- image: "fedora"
@@ -32,8 +28,6 @@ molecule:
3228
tag: "latest"
3329
- image: "fedora"
3430
tag: "rawhide"
35-
- image: "opensuse"
36-
tag: "latest"
3731
- image: "ubuntu"
3832
tag: "latest"
3933
- image: "ubuntu"

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,10 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
9090
|container|tags|
9191
|---------|----|
9292
|[Alpine](https://hub.docker.com/r/robertdebock/alpine)|all|
93-
|[Amazon](https://hub.docker.com/r/robertdebock/amazonlinux)|all|
93+
|[Amazon](https://hub.docker.com/r/robertdebock/amazonlinux)|Candidate|
9494
|[Debian](https://hub.docker.com/r/robertdebock/debian)|all|
95-
|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|8, 9|
95+
|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|9|
9696
|[Fedora](https://hub.docker.com/r/robertdebock/fedora)|all|
97-
|[opensuse](https://hub.docker.com/r/robertdebock/opensuse)|all|
9897
|[Ubuntu](https://hub.docker.com/r/robertdebock/ubuntu)|all|
9998

10099
The minimum version of Ansible required is 2.12, tests have been done to:

meta/main.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,16 @@ galaxy_info:
1313
- all
1414
- name: Amazon
1515
versions:
16-
- all
16+
- Candidate
1717
- name: Debian
1818
versions:
1919
- all
2020
- name: EL
2121
versions:
22-
- "8"
2322
- "9"
2423
- name: Fedora
2524
versions:
2625
- all
27-
- name: opensuse
28-
versions:
29-
- all
3026
- name: Ubuntu
3127
versions:
3228
- all

molecule/default/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ platforms:
1818
image: "${namespace:-robertdebock}/${image:-fedora}:${tag:-latest}"
1919
command: /sbin/init
2020
volumes:
21-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
21+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2222
privileged: true
2323
pre_build_image: true
2424
provisioner:

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ansible-compat == 4.*
2-
molecule == 6.*
1+
ansible-compat == 24.*
2+
molecule == 24.*
33
molecule-plugins[docker] == 23.*
4-
ansible-lint == 6.*
4+
ansible-lint == 24.*
55
paramiko == 3.*

0 commit comments

Comments
 (0)