diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 7dbe77b..2e648df 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -29,17 +29,24 @@ jobs: fail-fast: false matrix: config: - - image: "enterpriselinux" - tag: "8" - image: "enterpriselinux" tag: "latest" 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-action@6.0.1 - with: + run: molecule converge + env: image: ${{ matrix.config.image }} tag: ${{ matrix.config.tag }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aadfa5f..753c4a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,6 @@ molecule: - if: $CI_COMMIT_REF_NAME == "master" parallel: matrix: - - image: "enterpriselinux" - tag: "8" - image: "enterpriselinux" tag: "latest" diff --git a/README.md b/README.md index 3df1929..42753dd 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ This role has been tested on these [container images](https://hub.docker.com/u/r |container|tags| |---------|----| -|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|all| +|[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|9| The minimum version of Ansible required is 2.12, tests have been done to: diff --git a/meta/main.yml b/meta/main.yml index b443b73..ccec368 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -10,7 +10,7 @@ galaxy_info: platforms: - name: EL versions: - - all + - "9" galaxy_tags: - epel diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 43adaca..078b467 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -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: diff --git a/requirements.txt b/requirements.txt index 65b52f4..4d7adb3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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.*