Skip to content

Commit

Permalink
what the...?
Browse files Browse the repository at this point in the history
  • Loading branch information
buluma committed Dec 25, 2023
1 parent 480a2a5 commit 07b9334
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 99 deletions.
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: Bug report
about: Create a report to help me improve
about: Create a report to help me improve this role.

---

## Describe the bug
# Describe the bug

A clear and concise description of what the bug is.

Expand All @@ -13,18 +13,18 @@ A clear and concise description of what the bug is.
Please paste the playbook you are using. (Consider `requirements.yml` and
optionally the command you've invoked.)


```yaml
---
YOUR PLAYBOOK HERE
```

## Output

Show at least the error, possible related output, maybe just all the output.
Show at least the error, possible related output, if possible all the output.

## Environment

- Control node OS: [e.g. Debian 9] (`cat /etc/os-release`)
- Control node Ansible version: [e.g. 2.9.1] (`ansible --version`)
- Managed node OS: [e.g. CentOS 7] (`cat /etc/os-release`)

3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ about: Suggest an idea for this project

---

## Proposed feature
# Proposed feature

A clear and concise description of what you want to happen.

Expand All @@ -15,3 +15,4 @@ Why is this feature required?
## Additional context

Add any other context about the feature request here.

7 changes: 4 additions & 3 deletions .github/workflows/galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: galaxy
uses: buluma/galaxy-action@v1.0.3
# uses: buluma/galaxy-action@v6.25.22 # TODO: rebuild action
uses: robertdebock/galaxy-action@1.2.1
with:
galaxy_api_key: ${{ secrets.galaxy_api_key }}
git_branch: master
galaxy_api_key: ${{ secrets.galaxy_api_key }}
git_branch: ${{ github.event.repository.default_branch }}
47 changes: 28 additions & 19 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,22 @@
name: Ansible Molecule

on:
# Schedule updates (once daily)
push:
branches:
- master
- main
- testing
paths-ignore:
- '**/README.md'
- '**/CHANGELOG.md'
tags_ignore:
- '*'
pull_request:
schedule:
- cron: '35 18 * * *'
- cron: '35 18 18 * *'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
push: {branches: ["master", "main", "testing"]}

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
Expand All @@ -21,13 +32,9 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: checkout
uses: actions/checkout@v3
with:
path: "${{ github.repository }}"
- name: molecule
uses: buluma/molecule-action@v4.0.7
with:
command: lint
uses: actions/checkout@v4
- name: ansible-lint
uses: ansible-community/ansible-lint-action@main
test:
needs:
- lint
Expand All @@ -37,24 +44,26 @@ jobs:
matrix:
config:
- image: "enterpriselinux"
tag: "latest"
tag: "8"
- image: "debian-systemd"
tag: "latest"
tag: "bullseye"
- image: "fedora-systemd"
tag: "34"
tag: "38"
- image: "fedora-systemd"
tag: "latest"
- image: "fedora-systemd"
tag: "rawhide"
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: "${{ github.repository }}"
- name: disable apparmor for mysql
run: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
- name: parse apparmor for mysql
run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
# - name: disable apparmor for mysql
# run: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
# - name: parse apparmor for mysql
# run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
- name: molecule
uses: buluma/molecule-action@v4.0.7
uses: buluma/molecule-action@v6.0.0
with:
image: ${{ matrix.config.image }}
tag: ${{ matrix.config.tag }}
18 changes: 7 additions & 11 deletions .github/workflows/requirements2png.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,23 @@
#

on:
workflow_dispatch:
push: {branches: ["master", "main"]}


concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

push:
paths:
- '.github/workflows/requirements2png.yml'
name: Ansible Graphviz

jobs:
build:
runs-on: ubuntu-20.04
permissions:
contents: write
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ github.repository }}
- name: create png
uses: buluma/graphviz-action@1.0.0
uses: buluma/graphviz-action@1.0.0 # TODO: Update action
- name: Commit files
run: |
cd ${{ github.repository }}
Expand All @@ -34,7 +31,6 @@ jobs:
- name: save to png branch
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
directory: ${{ github.repository }}
force: true
branch: png
20 changes: 12 additions & 8 deletions .github/workflows/todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,23 @@ name: "TODO 2 Issue"

on:
push:

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true
branches:
- master
- main
- testing
paths-ignore:
- '**/README.md'
- '**/CHANGELOG.md'
tags_ignore:
- '*'

jobs:
build:
runs-on: "ubuntu-20.04"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@master"
- name: "TODO to Issue"
uses: "buluma/todo-to-issue-action@v1.0.1"
uses: "alstr/todo-to-issue-action@v2.3" # TODO: Update buluma/todo-to-issue-action@v1.0.1 @buluma
id: "todo"
with:
USER_PROJECTS: buluma/Ansible/To do
PROJECTS_SECRET: ${{ secrets.PROJECTS_SECRET }}
TOKEN: ${{ secrets.GITHUB_TOKEN }}
54 changes: 12 additions & 42 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,30 @@
---
image: "buluma/github-action-molecule:4.0.6"

services:
- docker:dind
image: "buluma/github-action-molecule:5.1.1"

variables:
DOCKER_HOST: "tcp://docker:2375"
PY_COLORS: 1

molecule:
script:
- image=${image} tag=${tag} molecule test
retry: 1
parallel:
matrix:
- image: "enterpriselinux"
tag: "latest"
- image: "debian-systemd"
tag: "latest"
- image: "fedora-systemd"
tag: "34"
- image: "fedora-systemd"
tag: "latest"

testing:
script:
- image=${image} tag=${tag} molecule test
- molecule test
rules:
- if: $CI_COMMIT_REF_NAME == "testing"
retry: 1
- if: $CI_COMMIT_REF_NAME == "master"
allow_failure: true
parallel:
matrix:
- image: "enterpriselinux"
tag: "latest"
tag: "8"
- image: "debian-systemd"
tag: "latest"
tag: "bullseye"
- image: "fedora-systemd"
tag: "34"
tag: "38"
- image: "fedora-systemd"
tag: "latest"
- image: "fedora-systemd"
tag: "rawhide"

galaxy:
script:
- ansible-galaxy role info buluma.revealmd

role_testing:
script:
- image=${image} tag=${tag} ansible-galaxy install buluma.revealmd
retry: 1
parallel:
matrix:
- image: "enterpriselinux"
tag: "latest"
- image: "debian-systemd"
tag: "latest"
- image: "fedora-systemd"
tag: "34"
- image: "fedora-systemd"
tag: "latest"
- ansible-galaxy role import --api-key ${GALAXY_API_KEY} buluma ${CI_PROJECT_NAME}
rules:
- if: $CI_COMMIT_TAG != null
18 changes: 7 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# These role have been tested with these PIP component.
# To install the required version yourself, use a command as:
# `python -m pip --user install -r requirements.txt`
# See the pip requirements file documentation for details:
# https://pip.pypa.io/en/stable/user_guide/#requirements-files
#
# Tests run on the previous and current (latest) version of Ansible.
ansible>=2.10
# Some Jinja2 filters are used that are available in the newer releases.
jinja2>=2.11.2
jmespath
ansible-compat == 4.*
molecule == 6.*
molecule-plugins[docker] == 23.*
ansible-lint == 6.*
paramiko == 3.*
# Pinning requests version due to [bug](https://github.com/docker/docker-py/issues/3113)
# requests == 2.28.1

0 comments on commit 07b9334

Please sign in to comment.