Skip to content

Commit

Permalink
Make GitHub CI work.
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-de-bock authored and adf-patrickha committed Jul 4, 2024
1 parent e8243b4 commit 372b7c1
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 14 deletions.
18 changes: 15 additions & 3 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ jobs:
tag: "bullseye"
- image: "debian"
tag: "buster"
- image: "enterpriselinux"
tag: "7"
- image: "enterpriselinux"
tag: "8"
- image: "enterpriselinux"
Expand All @@ -54,7 +52,7 @@ jobs:
tag: "focal"
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: "${{ github.repository }}"
- name: disable apparmor for mysql
Expand All @@ -64,5 +62,19 @@ jobs:
- name: molecule
uses: robertdebock/[email protected]
with:

- name: Set up Python 3.
uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: molecule
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 @@ -18,14 +18,10 @@ molecule:
tag: "bullseye"
- image: "debian"
tag: "buster"
- image: "enterpriselinux"
tag: "7"
- image: "enterpriselinux"
tag: "8"
- image: "enterpriselinux"
tag: "latest"
- image: "fedora"
tag: "37"
- image: "fedora"
tag: "38"
- image: "opensuse"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
|---------|----|
|[Debian](https://hub.docker.com/r/robertdebock/debian)|buster, bullseye, bookworm|
|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|9|
|[Fedora](https://hub.docker.com/r/robertdebock/fedora/)|38,39|
|[Fedora](https://hub.docker.com/r/robertdebock/fedora)|38, 39|
|[Ubuntu](https://hub.docker.com/r/robertdebock/ubuntu)|jammy|
The minimum version of Ansible required is 2.12, tests have been done to:
Expand Down
5 changes: 2 additions & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ galaxy_info:
- buster
- name: EL
versions:
- "8"
- "9"
- all
- name: Fedora
versions:
- "37"
- "38"
- "39"
- name: opensuse
versions:
- all
Expand Down
6 changes: 6 additions & 0 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ platforms:
image: "${namespace:-robertdebock}/${image:-fedora}:${tag:-latest}"
command: /sbin/init
volumes:
<<<<<<< HEAD
- /sys/fs/cgroup:/sys/fs/cgroup:ro
privileged: yes
pre_build_image: yes
=======
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
pre_build_image: true
>>>>>>> 945bbd6 (Make GitHub CI work.)
provisioner:
name: ansible
verifier:
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Pinning ansible-compat version due to [bug](https://github.com/ansible-community/molecule/issues/3903)
ansible-compat == 4.*
molecule == 6.*
ansible-compat == 24.*
molecule == 24.*
molecule-plugins == 23.*
docker == 7.*
ansible-lint == 6.*
ansible-lint == 24.*
paramiko == 3.*
1 change: 1 addition & 0 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---

roles:
- name: robertdebock.bootstrap
- name: adfinis.bareos_repository
Expand Down

0 comments on commit 372b7c1

Please sign in to comment.