From a49b5bc24330f8ecba330eeb57c91b64b5c4b9a6 Mon Sep 17 00:00:00 2001 From: Michael Buluma Date: Fri, 29 Mar 2024 08:03:50 +0300 Subject: [PATCH] Ansible Generated Update. --- .github/workflows/molecule.yml | 49 +++++++++++++++++++--------------- .pre-commit-config.yaml | 3 ++- .yamllint | 3 ++- README.md | 20 +++++++------- molecule/default/molecule.yml | 4 +-- requirements.txt | 4 +-- 6 files changed, 45 insertions(+), 38 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index a736dd8..67be9bc 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -12,7 +12,7 @@ on: - main - testing - dependabot/** - - renovate/** + # - renovate/** paths-ignore: - '**/README.md' - '**/CHANGELOG.md' @@ -24,7 +24,6 @@ on: # - cron: '3 2 2 * *' - cron: '3 2 * * *' - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: permissions: write-all @@ -42,39 +41,43 @@ jobs: - name: ansible-lint uses: ansible-community/ansible-lint-action@main test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: config: - - image: "alpine-openrc" - tag: "latest" + - image: "alpine" + tag: "all" - image: "amazonlinux" tag: "latest" - - image: "enterpriselinux" - tag: "7" - image: "enterpriselinux" tag: "8" - image: "enterpriselinux" tag: "latest" - - image: "debian-systemd" - tag: "latest" - - image: "debian-systemd" + - image: "docker-molecule-images" + tag: "buster" + - image: "docker-molecule-images" tag: "bullseye" - - image: "fedora-systemd" + - image: "docker-molecule-images" + tag: "37" + - image: "docker-molecule-images" tag: "38" - - image: "fedora-systemd" - tag: "latest" - - image: "fedora-systemd" + - image: "docker-molecule-images" + tag: "39" + - image: "docker-molecule-images" + tag: "40" + - image: "docker-molecule-images" tag: "rawhide" - - image: "docker-opensuse-systemd" - tag: "latest" - - image: "docker-ubuntu-systemd" - tag: "latest" - - image: "docker-ubuntu-systemd" + - image: "docker-molecule-images" + tag: "opensuse" + - image: "docker-molecule-images" tag: "focal" - - image: "docker-ubuntu-systemd" + - image: "docker-molecule-images" tag: "bionic" + - image: "docker-molecule-images" + tag: "jammy" + - image: "docker-molecule-images" + tag: "lunar" steps: - name: Checkout Role uses: actions/checkout@v4 @@ -85,18 +88,20 @@ jobs: with: image: ${{ matrix.config.image }} tag: ${{ matrix.config.tag }} + - name: Running Role Test + run: ansible-galaxy role import --api-key ${{ secrets.galaxy_api_key }} buluma ${{ github.event.repository.name }} dependabot: needs: - lint - test - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'buluma' && github.event_name == 'pull_request'}} steps: - uses: "actions/checkout@master" - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v1 + uses: dependabot/fetch-metadata@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} - name: Approve a PR diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6f3deda..277ab07 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,8 @@ repos: rev: v1.32.0 hooks: - id: yamllint - args: [-c=.yamllint] + args: + - -c=.yamllint - repo: https://github.com/buluma/pre-commit rev: v1.0.3 diff --git a/.yamllint b/.yamllint index a7ff098..1460f2c 100644 --- a/.yamllint +++ b/.yamllint @@ -9,7 +9,8 @@ rules: max-spaces-inside: 1 level: error line-length: disable - truthy: disable + truthy: + check-keys: false ignore: | .tox/ diff --git a/README.md b/README.md index e8bb216..de383a6 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ Prepare your system to be managed by Ansible. -|GitHub|GitLab|Version|Issues|Pull Requests|Downloads| -|------|------|-------|------|-------------|---------| -|[![github](https://github.com/buluma/ansible-role-bootstrap/actions/workflows/molecule.yml/badge.svg)](https://github.com/buluma/ansible-role-bootstrap/actions/workflows/molecule.yml)|[![gitlab](https://gitlab.com/shadowwalker/ansible-role-bootstrap/badges/main/pipeline.svg)](https://gitlab.com/shadowwalker/ansible-role-bootstrap)|[![Version](https://img.shields.io/github/release/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/releases/)|[![Issues](https://img.shields.io/github/issues/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/issues/)|[![PullRequests](https://img.shields.io/github/issues-pr-closed-raw/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/pulls/)|[![Ansible Role](https://img.shields.io/ansible/role/d/buluma/bootstrap)](https://galaxy.ansible.com/ui/standalone/roles/buluma/bootstrap/documentation)| +|GitHub|Version|Issues|Pull Requests|Downloads| +|------|-------|------|-------------|---------| +|[![github](https://github.com/buluma/ansible-role-bootstrap/actions/workflows/molecule.yml/badge.svg)](https://github.com/buluma/ansible-role-bootstrap/actions/workflows/molecule.yml)|[![Version](https://img.shields.io/github/release/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/releases/)|[![Issues](https://img.shields.io/github/issues/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/issues/)|[![PullRequests](https://img.shields.io/github/issues-pr-closed-raw/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/pulls/)|[![Ansible Role](https://img.shields.io/ansible/role/d/buluma/bootstrap)](https://galaxy.ansible.com/ui/standalone/roles/buluma/bootstrap/documentation)| ## [Example Playbook](#example-playbook) @@ -66,13 +66,13 @@ This role has been tested on these [container images](https://hub.docker.com/u/b |container|tags| |---------|----| -|[Alpine](https://hub.docker.com/repository/docker/buluma/alpine/general)|all| -|[Amazon](https://hub.docker.com/repository/docker/buluma/amazonlinux/general)|Candidate| -|[EL](https://hub.docker.com/repository/docker/buluma/enterpriselinux/general)|all| -|[Debian](https://hub.docker.com/repository/docker/buluma/debian/general)|all| -|[Fedora](https://hub.docker.com/repository/docker/buluma/fedora/general)|all| -|[opensuse](https://hub.docker.com/repository/docker/buluma/opensuse/general)|all| -|[Ubuntu](https://hub.docker.com/repository/docker/buluma/ubuntu/general)|all| +|[Alpine](https://hub.docker.com/r/buluma/alpine)|all| +|[Amazon](https://hub.docker.com/r/buluma/amazonlinux)|Candidate| +|[EL](https://hub.docker.com/r/buluma/enterpriselinux)|all| +|[Debian](https://hub.docker.com/r/buluma/debian)|all| +|[Fedora](https://hub.docker.com/r/buluma/fedora)|all| +|[opensuse](https://hub.docker.com/r/buluma/opensuse)|all| +|[Ubuntu](https://hub.docker.com/r/buluma/ubuntu)|all| The minimum version of Ansible required is 2.12, tests have been done to: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index e2990fe..590162a 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -20,8 +20,8 @@ platforms: volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw cgroupns_mode: host - privileged: yes - pre_build_image: yes + privileged: true + pre_build_image: true provisioner: name: ansible verifier: diff --git a/requirements.txt b/requirements.txt index 666d866..ed09075 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ ansible-compat == 4.* -molecule == 6.* +molecule == 24.* molecule-plugins[docker] == 23.* -ansible-lint == 6.* +ansible-lint == 24.* paramiko == 3.* # Pinning requests version due to [bug](https://github.com/docker/docker-py/issues/3113) # requests == 2.28.1