Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ name: CI
- main
schedule:
- cron: '30 1 * * 3'
workflow_dispatch:

jobs:

Expand Down Expand Up @@ -43,6 +44,8 @@ jobs:
matrix:
include:
- distro: ubuntu2004
- distro: ubuntu2204
- distro: ubuntu2404
- distro: ubi8
platform: instance-r-rh
- distro: ubi9
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ repos:
- id: shell-lint

- repo: https://github.com/ansible-community/ansible-lint
rev: v5.4.0
rev: v25.4.0
hooks:
- id: ansible-lint

Expand Down
5 changes: 5 additions & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ galaxy_info:
- name: Ubuntu
versions:
- focal
- jammy
- noble
- name: EL
versions:
- "8"
galaxy_tags:
- development
- system
Expand Down
54 changes: 25 additions & 29 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,26 @@
---
dependency:
name: galaxy
driver:
name: docker
platforms:
- &instance
name: instance-r
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
capabilities:
- SYS_ADMIN
pre_build_image: true
platform: linux/amd64
- <<: *instance
name: instance-r-rh
image: "registry.access.redhat.com/${MOLECULE_DISTRO:-ubi9}/ubi-init"
command: "/usr/sbin/init"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
cgroupns_mode: host
provisioner:
name: ansible
playbooks:
prepare: prepare.yml
converge: converge.yml
verify: verify.yml
dependency:
name: galaxy
driver:
name: docker
platforms:
- &instance
name: instance-r
image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we keeping test with ubuntu2004?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests in CI are run for 20.04, 22.04 and 24.04. I think it doesn't matter that much what's the default here. When testing changes locally I typically run the tests against the newest and the oldest Ubuntu release

command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
privileged: true
cgroupns_mode: host
pre_build_image: true
platform: linux/amd64
- <<: *instance
name: instance-r-rh
image: "registry.access.redhat.com/${MOLECULE_DISTRO:-ubi8}/ubi-init"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why reverting test to rhel8?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I probably reverted that by accident, but similarly to this #18 (comment) - In CI we run the tests against both releases, so the default here is not so important

command: "/usr/sbin/init"
provisioner:
name: ansible
playbooks:
prepare: prepare.yml
converge: converge.yml
verify: verify.yml
Loading