Skip to content

Commit

Permalink
Making molecule on GitHub work again.
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-de-bock committed Jul 1, 2024
1 parent 4392101 commit 7ecf20b
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 23 deletions.
19 changes: 12 additions & 7 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ jobs:
tag: "latest"
- image: "amazonlinux"
tag: "latest"
- image: "enterpriselinux"
tag: "8"
- image: "enterpriselinux"
tag: "latest"
- image: "debian"
Expand All @@ -47,8 +45,6 @@ jobs:
tag: "latest"
- image: "fedora"
tag: "rawhide"
- image: "opensuse"
tag: "latest"
- image: "ubuntu"
tag: "latest"
- image: "ubuntu"
Expand All @@ -58,10 +54,19 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4

- name: Set up Python 3.
uses: actions/setup-python@v5
with:
path: "${{ github.repository }}"
python-version: '3.x'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: molecule
uses: robertdebock/molecule[email protected]
with:
run: molecule converge
env:
image: ${{ matrix.config.image }}
tag: ${{ matrix.config.tag }}
4 changes: 0 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ molecule:
tag: "latest"
- image: "amazonlinux"
tag: "latest"
- image: "enterpriselinux"
tag: "8"
- image: "enterpriselinux"
tag: "latest"
- image: "debian"
Expand All @@ -30,8 +28,6 @@ molecule:
tag: "latest"
- image: "fedora"
tag: "rawhide"
- image: "opensuse"
tag: "latest"
- image: "ubuntu"
tag: "latest"
- image: "ubuntu"
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,9 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
|---------|----|
|[Alpine](https://hub.docker.com/r/robertdebock/alpine)|all|
|[Amazon](https://hub.docker.com/r/robertdebock/amazonlinux)|Candidate|
|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|8, 9|
|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|all|
|[Debian](https://hub.docker.com/r/robertdebock/debian)|all|
|[Fedora](https://hub.docker.com/r/robertdebock/fedora)|all|
|[opensuse](https://hub.docker.com/r/robertdebock/opensuse)|all|
|[Ubuntu](https://hub.docker.com/r/robertdebock/ubuntu)|all|

The minimum version of Ansible required is 2.12, tests have been done to:
Expand Down
6 changes: 1 addition & 5 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,13 @@ galaxy_info:
- Candidate
- name: EL
versions:
- "8"
- "9"
- all
- name: Debian
versions:
- all
- name: Fedora
versions:
- all
- name: opensuse
versions:
- all
- name: Ubuntu
versions:
- all
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ platforms:
image: "${namespace:-robertdebock}/${image:-fedora}:${tag:-latest}"
command: /sbin/init
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
pre_build_image: true
provisioner:
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ansible-compat == 4.*
molecule == 6.*
ansible-compat == 24.*
molecule == 24.*
molecule-plugins[docker] == 23.*
ansible-lint == 6.*
ansible-lint == 24.*
paramiko == 3.*
1 change: 0 additions & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
roles:
- name: robertdebock.bootstrap
collections:

0 comments on commit 7ecf20b

Please sign in to comment.