From 9e0cc3eae185d6c8b799dd8c123a6e7313711a40 Mon Sep 17 00:00:00 2001 From: Michael Buluma Date: Thu, 10 Feb 2022 12:36:12 +0300 Subject: [PATCH 1/2] version bump --- .github/workflows/galaxy.yml | 2 +- .github/workflows/gitlab_trigger.yml | 2 +- .github/workflows/molecule.yml | 6 ++++-- .github/workflows/requirements2png.yml | 2 +- .github/workflows/todo.yml | 4 ++-- .gitlab-ci.yml | 11 +++++++++-- README.md | 11 ++++++----- 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml index bfce1bf..7699945 100644 --- a/.github/workflows/galaxy.yml +++ b/.github/workflows/galaxy.yml @@ -13,6 +13,6 @@ jobs: runs-on: ubuntu-20.04 steps: - name: galaxy - uses: buluma/galaxy-action@v1.0.1 + uses: buluma/galaxy-action@1.1.0 with: galaxy_api_key: ${{ secrets.galaxy_api_key }} diff --git a/.github/workflows/gitlab_trigger.yml b/.github/workflows/gitlab_trigger.yml index 2af7d80..ff1aed2 100644 --- a/.github/workflows/gitlab_trigger.yml +++ b/.github/workflows/gitlab_trigger.yml @@ -7,7 +7,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2.4.0 - name: Mirror + trigger CI uses: SvanBoxel/gitlab-mirror-and-ci-action@master with: diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index fc89e99..4af8257 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v2.4.0 with: path: "${{ github.repository }}" - name: molecule @@ -35,6 +35,8 @@ jobs: fail-fast: false matrix: config: + - image: "alpine-openrc" + tag: "latest" - image: "amazonlinux" tag: "latest" - image: "enterpriselinux" @@ -59,7 +61,7 @@ jobs: tag: "bionic" steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v2.4.0 with: path: "${{ github.repository }}" - name: disable apparmor for mysql diff --git a/.github/workflows/requirements2png.yml b/.github/workflows/requirements2png.yml index f74ad1f..bdb0174 100644 --- a/.github/workflows/requirements2png.yml +++ b/.github/workflows/requirements2png.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v2.4.0 with: path: ${{ github.repository }} - name: create png diff --git a/.github/workflows/todo.yml b/.github/workflows/todo.yml index 3e6e417..d944733 100644 --- a/.github/workflows/todo.yml +++ b/.github/workflows/todo.yml @@ -12,9 +12,9 @@ jobs: build: runs-on: "ubuntu-20.04" steps: - - uses: "actions/checkout@master" + - uses: "actions/checkout@v2.4.0" - name: "TODO to Issue" - uses: "alstr/todo-to-issue-action@v2.3" + uses: "alstr/todo-to-issue-action@v4.6" id: "todo" with: TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1b100c..2e3da9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,8 @@ molecule: retry: 1 parallel: matrix: + - image: "alpine-openrc" + tag: "latest" - image: "amazonlinux" tag: "latest" - image: "enterpriselinux" @@ -47,6 +49,8 @@ testing: retry: 1 parallel: matrix: + - image: "alpine-openrc" + tag: "latest" - image: "amazonlinux" tag: "latest" - image: "enterpriselinux" @@ -70,7 +74,10 @@ testing: - image: "docker-ubuntu-systemd" tag: "bionic" - galaxy: script: - - ansible-galaxy role info ${CI_PROJECT_NAMESPACE}.bootstrap + - ansible-galaxy role info buluma.bootstrap + +test_role: + script: + - ansible-galaxy install buluma.bootstrap diff --git a/README.md b/README.md index 870a957..f4e7383 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Prepare your system to be managed by Ansible. |GitHub|GitLab|Quality|Downloads|Version| |------|------|-------|---------|-------| -|[![github](https://github.com/buluma/ansible-role-bootstrap/workflows/Ansible%20Molecule/badge.svg)](https://github.com/buluma/ansible-role-bootstrap/actions)|[![pipeline status](https://gitlab.com/buluma/ansible-role-bootstrap/badges/main/pipeline.svg)](https://gitlab.com/buluma/ansible-role-bootstrap)|[![quality](https://img.shields.io/ansible/quality/57824)](https://galaxy.ansible.com/buluma/bootstrap)|[![downloads](https://img.shields.io/ansible/role/d/57824)](https://galaxy.ansible.com/buluma/bootstrap)|[![Version](https://img.shields.io/github/release/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/releases/)| +|[![github](https://github.com/buluma/ansible-role-bootstrap/workflows/Ansible%20Molecule/badge.svg)](https://github.com/buluma/ansible-role-bootstrap/actions)|[![gitlab](https://gitlab.com/buluma/ansible-role-bootstrap/badges/main/pipeline.svg)](https://gitlab.com/buluma/ansible-role-bootstrap)|[![quality](https://img.shields.io/ansible/quality/57824)](https://galaxy.ansible.com/buluma/bootstrap)|[![downloads](https://img.shields.io/ansible/role/d/57824)](https://galaxy.ansible.com/buluma/bootstrap)|[![Version](https://img.shields.io/github/release/buluma/ansible-role-bootstrap.svg)](https://github.com/buluma/ansible-role-bootstrap/releases/)| ## [Example Playbook](#example-playbook) @@ -17,7 +17,8 @@ This example is taken from `molecule/default/converge.yml` and is tested on each gather_facts: no roles: - - role: buluma.bootstrap``` + - role: buluma.bootstrap +``` ## [Role Variables](#role-variables) @@ -39,12 +40,12 @@ bootstrap_timeout: 3 ## [Requirements](#requirements) -- pip packages listed in [requirements.txt](https://github.com/buluma/ansible-role-bootstrap/blob/master/requirements.txt). +- pip packages listed in [requirements.txt](https://github.com/buluma/ansible-role-bootstrap/blob/main/requirements.txt). ## [Context](#context) -This role is a part of many compatible roles. Have a look at [the documentation of these roles](https://buluma.nl/) for further information. +This role is a part of many compatible roles. Have a look at [the documentation of these roles](https://buluma.co.ke/) for further information. Here is an overview of related roles: @@ -87,4 +88,4 @@ Apache-2.0 ## [Author Information](#author-information) -[Michael Buluma](https://buluma.co.ke/) +[Michael Buluma](https://buluma.github.io/) From b77e4eccc702ed8f24e99f4480ebc2ca4b021150 Mon Sep 17 00:00:00 2001 From: Michael Buluma Date: Thu, 10 Feb 2022 13:43:24 +0300 Subject: [PATCH 2/2] Update .gitlab-ci.yml --- .gitlab-ci.yml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e3da9d..4c3408d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,10 +74,70 @@ testing: - image: "docker-ubuntu-systemd" tag: "bionic" +role_testing: + script: + - image=${image} tag=${tag} ansible-galaxy install buluma.bootstrap + rules: + - if: $CI_COMMIT_REF_NAME == "testing" + retry: 1 + parallel: + matrix: + - image: "alpine-openrc" + tag: "latest" + - image: "amazonlinux" + tag: "latest" + - image: "enterpriselinux" + tag: "7" + - image: "enterpriselinux" + tag: "latest" + - image: "debian-systemd" + tag: "latest" + - image: "debian-systemd" + tag: "bookworm" + - image: "fedora-systemd" + tag: "34" + - image: "fedora-systemd" + tag: "latest" + - image: "fedora-systemd" + tag: "rawhide" + - image: "opensuse" + tag: "latest" + - image: "docker-ubuntu-systemd" + tag: "latest" + - image: "docker-ubuntu-systemd" + tag: "bionic" + galaxy: script: - ansible-galaxy role info buluma.bootstrap -test_role: +role_testing_live: script: - - ansible-galaxy install buluma.bootstrap + - image=${image} tag=${tag} ansible-galaxy install buluma.bootstrap + retry: 1 + parallel: + matrix: + - image: "alpine-openrc" + tag: "latest" + - image: "amazonlinux" + tag: "latest" + - image: "enterpriselinux" + tag: "7" + - image: "enterpriselinux" + tag: "latest" + - image: "debian-systemd" + tag: "latest" + - image: "debian-systemd" + tag: "bookworm" + - image: "fedora-systemd" + tag: "34" + - image: "fedora-systemd" + tag: "latest" + - image: "fedora-systemd" + tag: "rawhide" + - image: "opensuse" + tag: "latest" + - image: "docker-ubuntu-systemd" + tag: "latest" + - image: "docker-ubuntu-systemd" + tag: "bionic"