From ae0a493e6523288dd27e4afe3946e56b4ade216d Mon Sep 17 00:00:00 2001 From: mullholland Date: Sun, 28 May 2023 08:12:46 +0200 Subject: [PATCH] ci: update tests --- files/bug_report.md | 2 -- files/feature_request.md | 2 -- generate.yml | 2 ++ templates/CONTRIBUTING.md.j2 | 4 +-- templates/dependabot.yml.j2 | 15 ++++++++++ tests/README.md | 1 - tests/ansible-role-default/.ansible-lint | 6 ++++ .../.github/ISSUE_TEMPLATE/bug_report.md | 2 -- .../.github/ISSUE_TEMPLATE/feature_request.md | 2 -- .../.github/dependabot.yml | 17 +++++++++++ .../.github/workflows/galaxy.yml | 2 +- .../.github/workflows/go-semantic-release.yml | 28 +++++++++++++++++++ .../.github/workflows/molecule.yml | 11 ++++---- tests/ansible-role-default/.gitlab-ci.yml | 10 +++---- tests/ansible-role-default/.semrelrc | 19 +++++++++++++ tests/ansible-role-default/CONTRIBUTING.md | 10 +++---- tests/ansible-role-default/LICENSE | 2 +- .../molecule/default/molecule.yml | 2 +- tests/ansible-role-minimal/.ansible-lint | 11 ++++---- .../.github/ISSUE_TEMPLATE/bug_report.md | 2 -- .../.github/ISSUE_TEMPLATE/feature_request.md | 2 -- .../.github/dependabot.yml | 17 +++++++++++ .../.github/workflows/galaxy.yml | 2 +- .../.github/workflows/go-semantic-release.yml | 28 +++++++++++++++++++ .../.github/workflows/molecule.yml | 11 ++++---- tests/ansible-role-minimal/.gitlab-ci.yml | 10 +++---- tests/ansible-role-minimal/.semrelrc | 19 +++++++++++++ tests/ansible-role-minimal/CONTRIBUTING.md | 10 +++---- tests/ansible-role-minimal/LICENSE | 2 +- .../molecule/default/molecule.yml | 4 +-- tests/ansible-role-preferences/.ansible-lint | 6 ++++ .../.github/ISSUE_TEMPLATE/bug_report.md | 2 -- .../.github/ISSUE_TEMPLATE/feature_request.md | 2 -- .../.github/dependabot.yml | 17 +++++++++++ .../.github/workflows/galaxy.yml | 2 +- .../.github/workflows/go-semantic-release.yml | 28 +++++++++++++++++++ .../.github/workflows/molecule.yml | 13 +++++---- tests/ansible-role-preferences/.gitlab-ci.yml | 10 +++---- tests/ansible-role-preferences/.semrelrc | 19 +++++++++++++ .../ansible-role-preferences/CONTRIBUTING.md | 10 +++---- tests/ansible-role-preferences/LICENSE | 2 +- .../molecule/default/molecule.yml | 5 +++- tests/ansible-role-version/.ansible-lint | 6 ++++ .../.github/ISSUE_TEMPLATE/bug_report.md | 2 -- .../.github/ISSUE_TEMPLATE/feature_request.md | 2 -- .../.github/dependabot.yml | 17 +++++++++++ .../.github/workflows/galaxy.yml | 2 +- .../.github/workflows/go-semantic-release.yml | 28 +++++++++++++++++++ .../.github/workflows/molecule.yml | 11 ++++---- tests/ansible-role-version/.gitlab-ci.yml | 10 +++---- tests/ansible-role-version/.semrelrc | 19 +++++++++++++ tests/ansible-role-version/CONTRIBUTING.md | 10 +++---- tests/ansible-role-version/LICENSE | 2 +- .../molecule/default/molecule.yml | 2 +- vars/main.yml | 2 +- 55 files changed, 381 insertions(+), 103 deletions(-) create mode 100644 templates/dependabot.yml.j2 create mode 100644 tests/ansible-role-default/.github/dependabot.yml create mode 100644 tests/ansible-role-default/.github/workflows/go-semantic-release.yml create mode 100644 tests/ansible-role-default/.semrelrc create mode 100644 tests/ansible-role-minimal/.github/dependabot.yml create mode 100644 tests/ansible-role-minimal/.github/workflows/go-semantic-release.yml create mode 100644 tests/ansible-role-minimal/.semrelrc create mode 100644 tests/ansible-role-preferences/.github/dependabot.yml create mode 100644 tests/ansible-role-preferences/.github/workflows/go-semantic-release.yml create mode 100644 tests/ansible-role-preferences/.semrelrc create mode 100644 tests/ansible-role-version/.github/dependabot.yml create mode 100644 tests/ansible-role-version/.github/workflows/go-semantic-release.yml create mode 100644 tests/ansible-role-version/.semrelrc diff --git a/files/bug_report.md b/files/bug_report.md index 4bb9d98..f8b0654 100644 --- a/files/bug_report.md +++ b/files/bug_report.md @@ -28,5 +28,3 @@ Show at least the error, possible related output, maybe just all the output. - 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`) - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/files/feature_request.md b/files/feature_request.md index 55a93c4..e0512b0 100644 --- a/files/feature_request.md +++ b/files/feature_request.md @@ -15,5 +15,3 @@ Why is this feature required? ## Additional context Add any other context about the feature request here. - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/generate.yml b/generate.yml index cead446..48f78f2 100755 --- a/generate.yml +++ b/generate.yml @@ -160,6 +160,8 @@ dest: .semrelrc - source: go-semantic-release.yml dest: .github/workflows/go-semantic-release.yml + - source: dependabot.yml + dest: .github/dependabot.yml loop_control: label: "{{ item.source }}" diff --git a/templates/CONTRIBUTING.md.j2 b/templates/CONTRIBUTING.md.j2 index a3a5fec..c15ca19 100644 --- a/templates/CONTRIBUTING.md.j2 +++ b/templates/CONTRIBUTING.md.j2 @@ -2,7 +2,7 @@ You can really make a difference by: -- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Arobertdebock+is%3Aissue+state%3Aopen).) +- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Amullholland+is%3Aissue+state%3Aopen).) - [Making a pull request](https://services.github.com/on-demand/github-cli/open-pull-request-github) when you see the error in code. I'll try to help and take every contribution seriously. @@ -57,7 +57,7 @@ image=centos tag=7 tox ### [5. Optionally: Regenerate all dynamic content](#5-optionally-regenerate-all-dynamic-content) -You can use [Ansible Generator](https://github.com/robertdebock/ansible-generator) to regenerate all dynamic content. +You can use [Ansible Generator](https://github.com/mullholland/ansible-generator) to regenerate all dynamic content. If you don't do it, I'll do it later for you. diff --git a/templates/dependabot.yml.j2 b/templates/dependabot.yml.j2 new file mode 100644 index 0000000..9a8b88a --- /dev/null +++ b/templates/dependabot.yml.j2 @@ -0,0 +1,15 @@ +--- +{{ ansible_managed | comment }} + +# Set update schedule for GitHub Actions + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "daily" + assignees: + - "mullholland" diff --git a/tests/README.md b/tests/README.md index 6778a4e..a2fcd14 100644 --- a/tests/README.md +++ b/tests/README.md @@ -4,6 +4,5 @@ A few roles to let CI try rendering files in different situations. ## Roles -- `ansible-role-default` - A default role, as generated by the [skeleton](https://github.com/robertdebock/ansible-role-skeleton) template. - `ansible-role-preferences` - Use `preferences.yml` to change behaviour. - `ansible-role-minimal` - A role that has the minimum amount of files. diff --git a/tests/ansible-role-default/.ansible-lint b/tests/ansible-role-default/.ansible-lint index 4aa401e..0cce1c4 100644 --- a/tests/ansible-role-default/.ansible-lint +++ b/tests/ansible-role-default/.ansible-lint @@ -12,3 +12,9 @@ exclude_paths: - ./.cache - ./.github - ./requirements.yml + +skip_list: + - yaml[truthy] + +enable_list: + - name[prefix] diff --git a/tests/ansible-role-default/.github/ISSUE_TEMPLATE/bug_report.md b/tests/ansible-role-default/.github/ISSUE_TEMPLATE/bug_report.md index 4bb9d98..f8b0654 100644 --- a/tests/ansible-role-default/.github/ISSUE_TEMPLATE/bug_report.md +++ b/tests/ansible-role-default/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,5 +28,3 @@ Show at least the error, possible related output, maybe just all the output. - 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`) - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/tests/ansible-role-default/.github/ISSUE_TEMPLATE/feature_request.md b/tests/ansible-role-default/.github/ISSUE_TEMPLATE/feature_request.md index 55a93c4..e0512b0 100644 --- a/tests/ansible-role-default/.github/ISSUE_TEMPLATE/feature_request.md +++ b/tests/ansible-role-default/.github/ISSUE_TEMPLATE/feature_request.md @@ -15,5 +15,3 @@ Why is this feature required? ## Additional context Add any other context about the feature request here. - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/tests/ansible-role-default/.github/dependabot.yml b/tests/ansible-role-default/.github/dependabot.yml new file mode 100644 index 0000000..48728ca --- /dev/null +++ b/tests/ansible-role-default/.github/dependabot.yml @@ -0,0 +1,17 @@ +--- +# +# Ansible managed +# + +# Set update schedule for GitHub Actions + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "daily" + assignees: + - "mullholland" diff --git a/tests/ansible-role-default/.github/workflows/galaxy.yml b/tests/ansible-role-default/.github/workflows/galaxy.yml index 092e544..1f8d455 100644 --- a/tests/ansible-role-default/.github/workflows/galaxy.yml +++ b/tests/ansible-role-default/.github/workflows/galaxy.yml @@ -13,6 +13,6 @@ jobs: runs-on: ubuntu-20.04 steps: - name: galaxy - uses: robertdebock/galaxy-action@1.2.0 + uses: robertdebock/galaxy-action@1.2.1 with: galaxy_api_key: ${{ secrets.galaxy_api_key }} diff --git a/tests/ansible-role-default/.github/workflows/go-semantic-release.yml b/tests/ansible-role-default/.github/workflows/go-semantic-release.yml new file mode 100644 index 0000000..dd21067 --- /dev/null +++ b/tests/ansible-role-default/.github/workflows/go-semantic-release.yml @@ -0,0 +1,28 @@ +--- +# +# Ansible managed +# + +name: Create a semantic release on push to main + +on: + push: + branches: + - "main" + +# If a 403 error occurs, make sure to set content permission to write +# see: https://github.com/go-semantic-release/action/issues/27 +permissions: + contents: write + +jobs: + release: + runs-on: ubuntu-latest + needs: test + steps: + - uses: actions/checkout@v2 + - uses: go-semantic-release/action@v1 + id: semrel + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + changelog-generator-opt: "emojis=true" diff --git a/tests/ansible-role-default/.github/workflows/molecule.yml b/tests/ansible-role-default/.github/workflows/molecule.yml index f229245..11115b4 100644 --- a/tests/ansible-role-default/.github/workflows/molecule.yml +++ b/tests/ansible-role-default/.github/workflows/molecule.yml @@ -11,7 +11,7 @@ on: - '*' pull_request: schedule: - - cron: '9 5 5 * *' + - cron: '7 4 4 * *' jobs: lint: @@ -39,11 +39,11 @@ jobs: tag: "latest" - image: "debian" tag: "bookworm" - - image: "enterpriselinux" + - image: "centos" tag: "7" - - image: "enterpriselinux" + - image: "centos" tag: "8" - - image: "enterpriselinux" + - image: "centos" tag: "latest" - image: "fedora" tag: "36" @@ -69,7 +69,8 @@ jobs: - name: parse apparmor for mysql run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - name: molecule - uses: robertdebock/molecule-action@5.0.2 + uses: robertdebock/molecule-action@5.0.3 with: + namespace: mullholland image: ${{ matrix.config.image }} tag: ${{ matrix.config.tag }} diff --git a/tests/ansible-role-default/.gitlab-ci.yml b/tests/ansible-role-default/.gitlab-ci.yml index 9faf38e..634f9db 100644 --- a/tests/ansible-role-default/.gitlab-ci.yml +++ b/tests/ansible-role-default/.gitlab-ci.yml @@ -1,5 +1,5 @@ --- -image: "robertdebock/github-action-molecule:5.0.0" +image: "robertdebock/github-action-molecule:5.0.2" variables: PY_COLORS: 1 @@ -22,11 +22,11 @@ molecule: tag: "latest" - image: "debian" tag: "bookworm" - - image: "enterpriselinux" + - image: "centos" tag: "7" - - image: "enterpriselinux" + - image: "centos" tag: "8" - - image: "enterpriselinux" + - image: "centos" tag: "latest" - image: "fedora" tag: "36" @@ -45,6 +45,6 @@ molecule: galaxy: script: - - ansible-galaxy role import --api-key ${GALAXY_API_KEY} robertdebock ${CI_PROJECT_NAME} + - ansible-galaxy role import --api-key ${GALAXY_API_KEY} mullholland ${CI_PROJECT_NAME} rules: - if: $CI_COMMIT_TAG != null diff --git a/tests/ansible-role-default/.semrelrc b/tests/ansible-role-default/.semrelrc new file mode 100644 index 0000000..c005655 --- /dev/null +++ b/tests/ansible-role-default/.semrelrc @@ -0,0 +1,19 @@ +{ + "plugins": { + "commit-analyzer": { + "name": "default@^1.0.0" + }, + "ci-condition": { + "name": "default" + }, + "changelog-generator": { + "name": "default", + "options": { + "emojis": "true" + } + }, + "provider": { + "name": "github" + } + } +} diff --git a/tests/ansible-role-default/CONTRIBUTING.md b/tests/ansible-role-default/CONTRIBUTING.md index 23102f5..b161234 100644 --- a/tests/ansible-role-default/CONTRIBUTING.md +++ b/tests/ansible-role-default/CONTRIBUTING.md @@ -2,7 +2,7 @@ You can really make a difference by: -- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Arobertdebock+is%3Aissue+state%3Aopen).) +- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Amullholland+is%3Aissue+state%3Aopen).) - [Making a pull request](https://services.github.com/on-demand/github-cli/open-pull-request-github) when you see the error in code. I'll try to help and take every contribution seriously. @@ -15,13 +15,13 @@ Here is how you can help, a lot of steps are related to GitHub, not specifically ### [1. Make an issue.](#1-make-an-issue) -When you spot an issue, [create an issue](https://github.com/robertdebock/ansible-role-default/issues). +When you spot an issue, [create an issue](https://github.com/mullholland/ansible-role-default/issues). Making the issue help me and others to find similar problems in the future. ### [2. Fork the project.](#2-fork-the-project) -On the top right side of [the repository on GitHub](https://github.com/robertdebock/ansible-role-default), click `fork`. This copies everything to your GitHub namespace. +On the top right side of [the repository on GitHub](https://github.com/mullholland/ansible-role-default), click `fork`. This copies everything to your GitHub namespace. ### [3. Make the changes](#3-make-the-changes) @@ -57,7 +57,7 @@ image=centos tag=7 tox ### [5. Optionally: Regenerate all dynamic content](#5-optionally-regenerate-all-dynamic-content) -You can use [Ansible Generator](https://github.com/robertdebock/ansible-generator) to regenerate all dynamic content. +You can use [Ansible Generator](https://github.com/mullholland/ansible-generator) to regenerate all dynamic content. If you don't do it, I'll do it later for you. @@ -73,4 +73,4 @@ Now I'll get a message that you've added some code. Thank you, really. CI starts to test your changes. You can follow the progress on Travis. -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). +Please consider [sponsoring me](https://github.com/sponsors/mullholland). diff --git a/tests/ansible-role-default/LICENSE b/tests/ansible-role-default/LICENSE index 4e25a26..a04e2ac 100644 --- a/tests/ansible-role-default/LICENSE +++ b/tests/ansible-role-default/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2023 Robert de Bock (robert@meinit.nl) + Copyright 2023 Mullholland (mullholland) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/ansible-role-default/molecule/default/molecule.yml b/tests/ansible-role-default/molecule/default/molecule.yml index a37fdd3..410d067 100644 --- a/tests/ansible-role-default/molecule/default/molecule.yml +++ b/tests/ansible-role-default/molecule/default/molecule.yml @@ -15,7 +15,7 @@ driver: name: docker platforms: - name: "default-${image:-fedora}-${tag:-latest}${TOX_ENVNAME}" - image: "${namespace:-robertdebock}/${image:-fedora}:${tag:-latest}" + image: "${namespace:-mullholland}/docker-${image:-fedora}-systemd:${tag:-latest}" command: /sbin/init volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro diff --git a/tests/ansible-role-minimal/.ansible-lint b/tests/ansible-role-minimal/.ansible-lint index 4aa401e..39303b1 100644 --- a/tests/ansible-role-minimal/.ansible-lint +++ b/tests/ansible-role-minimal/.ansible-lint @@ -2,13 +2,14 @@ # # Ansible managed # -exclude_paths: - - ./meta/preferences.yml - - ./molecule/default/prepare.yml - - ./molecule/default/converge.yml - - ./molecule/default/verify.yml - ./molecule/default/collections.yml - ./.tox - ./.cache - ./.github - ./requirements.yml + +skip_list: + - yaml[truthy] + +enable_list: + - name[prefix] diff --git a/tests/ansible-role-minimal/.github/ISSUE_TEMPLATE/bug_report.md b/tests/ansible-role-minimal/.github/ISSUE_TEMPLATE/bug_report.md index 4bb9d98..f8b0654 100644 --- a/tests/ansible-role-minimal/.github/ISSUE_TEMPLATE/bug_report.md +++ b/tests/ansible-role-minimal/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,5 +28,3 @@ Show at least the error, possible related output, maybe just all the output. - 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`) - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/tests/ansible-role-minimal/.github/ISSUE_TEMPLATE/feature_request.md b/tests/ansible-role-minimal/.github/ISSUE_TEMPLATE/feature_request.md index 55a93c4..e0512b0 100644 --- a/tests/ansible-role-minimal/.github/ISSUE_TEMPLATE/feature_request.md +++ b/tests/ansible-role-minimal/.github/ISSUE_TEMPLATE/feature_request.md @@ -15,5 +15,3 @@ Why is this feature required? ## Additional context Add any other context about the feature request here. - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/tests/ansible-role-minimal/.github/dependabot.yml b/tests/ansible-role-minimal/.github/dependabot.yml new file mode 100644 index 0000000..48728ca --- /dev/null +++ b/tests/ansible-role-minimal/.github/dependabot.yml @@ -0,0 +1,17 @@ +--- +# +# Ansible managed +# + +# Set update schedule for GitHub Actions + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "daily" + assignees: + - "mullholland" diff --git a/tests/ansible-role-minimal/.github/workflows/galaxy.yml b/tests/ansible-role-minimal/.github/workflows/galaxy.yml index 092e544..1f8d455 100644 --- a/tests/ansible-role-minimal/.github/workflows/galaxy.yml +++ b/tests/ansible-role-minimal/.github/workflows/galaxy.yml @@ -13,6 +13,6 @@ jobs: runs-on: ubuntu-20.04 steps: - name: galaxy - uses: robertdebock/galaxy-action@1.2.0 + uses: robertdebock/galaxy-action@1.2.1 with: galaxy_api_key: ${{ secrets.galaxy_api_key }} diff --git a/tests/ansible-role-minimal/.github/workflows/go-semantic-release.yml b/tests/ansible-role-minimal/.github/workflows/go-semantic-release.yml new file mode 100644 index 0000000..dd21067 --- /dev/null +++ b/tests/ansible-role-minimal/.github/workflows/go-semantic-release.yml @@ -0,0 +1,28 @@ +--- +# +# Ansible managed +# + +name: Create a semantic release on push to main + +on: + push: + branches: + - "main" + +# If a 403 error occurs, make sure to set content permission to write +# see: https://github.com/go-semantic-release/action/issues/27 +permissions: + contents: write + +jobs: + release: + runs-on: ubuntu-latest + needs: test + steps: + - uses: actions/checkout@v2 + - uses: go-semantic-release/action@v1 + id: semrel + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + changelog-generator-opt: "emojis=true" diff --git a/tests/ansible-role-minimal/.github/workflows/molecule.yml b/tests/ansible-role-minimal/.github/workflows/molecule.yml index f229245..47cb35f 100644 --- a/tests/ansible-role-minimal/.github/workflows/molecule.yml +++ b/tests/ansible-role-minimal/.github/workflows/molecule.yml @@ -11,7 +11,7 @@ on: - '*' pull_request: schedule: - - cron: '9 5 5 * *' + - cron: '25 13 13 * *' jobs: lint: @@ -39,11 +39,11 @@ jobs: tag: "latest" - image: "debian" tag: "bookworm" - - image: "enterpriselinux" + - image: "centos" tag: "7" - - image: "enterpriselinux" + - image: "centos" tag: "8" - - image: "enterpriselinux" + - image: "centos" tag: "latest" - image: "fedora" tag: "36" @@ -69,7 +69,8 @@ jobs: - name: parse apparmor for mysql run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - name: molecule - uses: robertdebock/molecule-action@5.0.2 + uses: robertdebock/molecule-action@5.0.3 with: + namespace: mullholland image: ${{ matrix.config.image }} tag: ${{ matrix.config.tag }} diff --git a/tests/ansible-role-minimal/.gitlab-ci.yml b/tests/ansible-role-minimal/.gitlab-ci.yml index 9faf38e..634f9db 100644 --- a/tests/ansible-role-minimal/.gitlab-ci.yml +++ b/tests/ansible-role-minimal/.gitlab-ci.yml @@ -1,5 +1,5 @@ --- -image: "robertdebock/github-action-molecule:5.0.0" +image: "robertdebock/github-action-molecule:5.0.2" variables: PY_COLORS: 1 @@ -22,11 +22,11 @@ molecule: tag: "latest" - image: "debian" tag: "bookworm" - - image: "enterpriselinux" + - image: "centos" tag: "7" - - image: "enterpriselinux" + - image: "centos" tag: "8" - - image: "enterpriselinux" + - image: "centos" tag: "latest" - image: "fedora" tag: "36" @@ -45,6 +45,6 @@ molecule: galaxy: script: - - ansible-galaxy role import --api-key ${GALAXY_API_KEY} robertdebock ${CI_PROJECT_NAME} + - ansible-galaxy role import --api-key ${GALAXY_API_KEY} mullholland ${CI_PROJECT_NAME} rules: - if: $CI_COMMIT_TAG != null diff --git a/tests/ansible-role-minimal/.semrelrc b/tests/ansible-role-minimal/.semrelrc new file mode 100644 index 0000000..c005655 --- /dev/null +++ b/tests/ansible-role-minimal/.semrelrc @@ -0,0 +1,19 @@ +{ + "plugins": { + "commit-analyzer": { + "name": "default@^1.0.0" + }, + "ci-condition": { + "name": "default" + }, + "changelog-generator": { + "name": "default", + "options": { + "emojis": "true" + } + }, + "provider": { + "name": "github" + } + } +} diff --git a/tests/ansible-role-minimal/CONTRIBUTING.md b/tests/ansible-role-minimal/CONTRIBUTING.md index d53b003..2f871d9 100644 --- a/tests/ansible-role-minimal/CONTRIBUTING.md +++ b/tests/ansible-role-minimal/CONTRIBUTING.md @@ -2,7 +2,7 @@ You can really make a difference by: -- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Arobertdebock+is%3Aissue+state%3Aopen).) +- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Amullholland+is%3Aissue+state%3Aopen).) - [Making a pull request](https://services.github.com/on-demand/github-cli/open-pull-request-github) when you see the error in code. I'll try to help and take every contribution seriously. @@ -15,13 +15,13 @@ Here is how you can help, a lot of steps are related to GitHub, not specifically ### [1. Make an issue.](#1-make-an-issue) -When you spot an issue, [create an issue](https://github.com/robertdebock/ansible-role-minimal/issues). +When you spot an issue, [create an issue](https://github.com/mullholland/ansible-role-minimal/issues). Making the issue help me and others to find similar problems in the future. ### [2. Fork the project.](#2-fork-the-project) -On the top right side of [the repository on GitHub](https://github.com/robertdebock/ansible-role-minimal), click `fork`. This copies everything to your GitHub namespace. +On the top right side of [the repository on GitHub](https://github.com/mullholland/ansible-role-minimal), click `fork`. This copies everything to your GitHub namespace. ### [3. Make the changes](#3-make-the-changes) @@ -57,7 +57,7 @@ image=centos tag=7 tox ### [5. Optionally: Regenerate all dynamic content](#5-optionally-regenerate-all-dynamic-content) -You can use [Ansible Generator](https://github.com/robertdebock/ansible-generator) to regenerate all dynamic content. +You can use [Ansible Generator](https://github.com/mullholland/ansible-generator) to regenerate all dynamic content. If you don't do it, I'll do it later for you. @@ -73,4 +73,4 @@ Now I'll get a message that you've added some code. Thank you, really. CI starts to test your changes. You can follow the progress on Travis. -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). +Please consider [sponsoring me](https://github.com/sponsors/mullholland). diff --git a/tests/ansible-role-minimal/LICENSE b/tests/ansible-role-minimal/LICENSE index 4e25a26..a04e2ac 100644 --- a/tests/ansible-role-minimal/LICENSE +++ b/tests/ansible-role-minimal/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2023 Robert de Bock (robert@meinit.nl) + Copyright 2023 Mullholland (mullholland) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/ansible-role-minimal/molecule/default/molecule.yml b/tests/ansible-role-minimal/molecule/default/molecule.yml index 74296a2..a47ec08 100644 --- a/tests/ansible-role-minimal/molecule/default/molecule.yml +++ b/tests/ansible-role-minimal/molecule/default/molecule.yml @@ -15,7 +15,7 @@ driver: name: docker platforms: - name: "minimal-${image:-fedora}-${tag:-latest}${TOX_ENVNAME}" - image: "${namespace:-robertdebock}/${image:-fedora}:${tag:-latest}" + image: "${namespace:-mullholland}/docker-${image:-fedora}-systemd:${tag:-latest}" command: /sbin/init volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro @@ -23,5 +23,3 @@ platforms: pre_build_image: yes provisioner: name: ansible -verifier: - name: ansible diff --git a/tests/ansible-role-preferences/.ansible-lint b/tests/ansible-role-preferences/.ansible-lint index 4aa401e..0cce1c4 100644 --- a/tests/ansible-role-preferences/.ansible-lint +++ b/tests/ansible-role-preferences/.ansible-lint @@ -12,3 +12,9 @@ exclude_paths: - ./.cache - ./.github - ./requirements.yml + +skip_list: + - yaml[truthy] + +enable_list: + - name[prefix] diff --git a/tests/ansible-role-preferences/.github/ISSUE_TEMPLATE/bug_report.md b/tests/ansible-role-preferences/.github/ISSUE_TEMPLATE/bug_report.md index 4bb9d98..f8b0654 100644 --- a/tests/ansible-role-preferences/.github/ISSUE_TEMPLATE/bug_report.md +++ b/tests/ansible-role-preferences/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,5 +28,3 @@ Show at least the error, possible related output, maybe just all the output. - 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`) - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/tests/ansible-role-preferences/.github/ISSUE_TEMPLATE/feature_request.md b/tests/ansible-role-preferences/.github/ISSUE_TEMPLATE/feature_request.md index 55a93c4..e0512b0 100644 --- a/tests/ansible-role-preferences/.github/ISSUE_TEMPLATE/feature_request.md +++ b/tests/ansible-role-preferences/.github/ISSUE_TEMPLATE/feature_request.md @@ -15,5 +15,3 @@ Why is this feature required? ## Additional context Add any other context about the feature request here. - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/tests/ansible-role-preferences/.github/dependabot.yml b/tests/ansible-role-preferences/.github/dependabot.yml new file mode 100644 index 0000000..48728ca --- /dev/null +++ b/tests/ansible-role-preferences/.github/dependabot.yml @@ -0,0 +1,17 @@ +--- +# +# Ansible managed +# + +# Set update schedule for GitHub Actions + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "daily" + assignees: + - "mullholland" diff --git a/tests/ansible-role-preferences/.github/workflows/galaxy.yml b/tests/ansible-role-preferences/.github/workflows/galaxy.yml index 092e544..1f8d455 100644 --- a/tests/ansible-role-preferences/.github/workflows/galaxy.yml +++ b/tests/ansible-role-preferences/.github/workflows/galaxy.yml @@ -13,6 +13,6 @@ jobs: runs-on: ubuntu-20.04 steps: - name: galaxy - uses: robertdebock/galaxy-action@1.2.0 + uses: robertdebock/galaxy-action@1.2.1 with: galaxy_api_key: ${{ secrets.galaxy_api_key }} diff --git a/tests/ansible-role-preferences/.github/workflows/go-semantic-release.yml b/tests/ansible-role-preferences/.github/workflows/go-semantic-release.yml new file mode 100644 index 0000000..dd21067 --- /dev/null +++ b/tests/ansible-role-preferences/.github/workflows/go-semantic-release.yml @@ -0,0 +1,28 @@ +--- +# +# Ansible managed +# + +name: Create a semantic release on push to main + +on: + push: + branches: + - "main" + +# If a 403 error occurs, make sure to set content permission to write +# see: https://github.com/go-semantic-release/action/issues/27 +permissions: + contents: write + +jobs: + release: + runs-on: ubuntu-latest + needs: test + steps: + - uses: actions/checkout@v2 + - uses: go-semantic-release/action@v1 + id: semrel + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + changelog-generator-opt: "emojis=true" diff --git a/tests/ansible-role-preferences/.github/workflows/molecule.yml b/tests/ansible-role-preferences/.github/workflows/molecule.yml index f229245..90ea0a5 100644 --- a/tests/ansible-role-preferences/.github/workflows/molecule.yml +++ b/tests/ansible-role-preferences/.github/workflows/molecule.yml @@ -11,7 +11,7 @@ on: - '*' pull_request: schedule: - - cron: '9 5 5 * *' + - cron: '31 16 16 * *' jobs: lint: @@ -39,11 +39,11 @@ jobs: tag: "latest" - image: "debian" tag: "bookworm" - - image: "enterpriselinux" + - image: "centos" tag: "7" - - image: "enterpriselinux" + - image: "centos" tag: "8" - - image: "enterpriselinux" + - image: "centos" tag: "latest" - image: "fedora" tag: "36" @@ -69,7 +69,10 @@ jobs: - name: parse apparmor for mysql run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - name: molecule - uses: robertdebock/molecule-action@5.0.2 + uses: robertdebock/molecule-action@5.0.3 with: + namespace: mullholland image: ${{ matrix.config.image }} tag: ${{ matrix.config.tag }} + env: + VAULT_LICENCE: ${{ secrets.VAULT_LICENSE }} someTHING: ${{ secrets.MY_VAR }} diff --git a/tests/ansible-role-preferences/.gitlab-ci.yml b/tests/ansible-role-preferences/.gitlab-ci.yml index 9faf38e..634f9db 100644 --- a/tests/ansible-role-preferences/.gitlab-ci.yml +++ b/tests/ansible-role-preferences/.gitlab-ci.yml @@ -1,5 +1,5 @@ --- -image: "robertdebock/github-action-molecule:5.0.0" +image: "robertdebock/github-action-molecule:5.0.2" variables: PY_COLORS: 1 @@ -22,11 +22,11 @@ molecule: tag: "latest" - image: "debian" tag: "bookworm" - - image: "enterpriselinux" + - image: "centos" tag: "7" - - image: "enterpriselinux" + - image: "centos" tag: "8" - - image: "enterpriselinux" + - image: "centos" tag: "latest" - image: "fedora" tag: "36" @@ -45,6 +45,6 @@ molecule: galaxy: script: - - ansible-galaxy role import --api-key ${GALAXY_API_KEY} robertdebock ${CI_PROJECT_NAME} + - ansible-galaxy role import --api-key ${GALAXY_API_KEY} mullholland ${CI_PROJECT_NAME} rules: - if: $CI_COMMIT_TAG != null diff --git a/tests/ansible-role-preferences/.semrelrc b/tests/ansible-role-preferences/.semrelrc new file mode 100644 index 0000000..c005655 --- /dev/null +++ b/tests/ansible-role-preferences/.semrelrc @@ -0,0 +1,19 @@ +{ + "plugins": { + "commit-analyzer": { + "name": "default@^1.0.0" + }, + "ci-condition": { + "name": "default" + }, + "changelog-generator": { + "name": "default", + "options": { + "emojis": "true" + } + }, + "provider": { + "name": "github" + } + } +} diff --git a/tests/ansible-role-preferences/CONTRIBUTING.md b/tests/ansible-role-preferences/CONTRIBUTING.md index 8c03303..5dc5f23 100644 --- a/tests/ansible-role-preferences/CONTRIBUTING.md +++ b/tests/ansible-role-preferences/CONTRIBUTING.md @@ -2,7 +2,7 @@ You can really make a difference by: -- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Arobertdebock+is%3Aissue+state%3Aopen).) +- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Amullholland+is%3Aissue+state%3Aopen).) - [Making a pull request](https://services.github.com/on-demand/github-cli/open-pull-request-github) when you see the error in code. I'll try to help and take every contribution seriously. @@ -15,13 +15,13 @@ Here is how you can help, a lot of steps are related to GitHub, not specifically ### [1. Make an issue.](#1-make-an-issue) -When you spot an issue, [create an issue](https://github.com/robertdebock/ansible-role-preferences/issues). +When you spot an issue, [create an issue](https://github.com/mullholland/ansible-role-preferences/issues). Making the issue help me and others to find similar problems in the future. ### [2. Fork the project.](#2-fork-the-project) -On the top right side of [the repository on GitHub](https://github.com/robertdebock/ansible-role-preferences), click `fork`. This copies everything to your GitHub namespace. +On the top right side of [the repository on GitHub](https://github.com/mullholland/ansible-role-preferences), click `fork`. This copies everything to your GitHub namespace. ### [3. Make the changes](#3-make-the-changes) @@ -57,7 +57,7 @@ image=centos tag=7 tox ### [5. Optionally: Regenerate all dynamic content](#5-optionally-regenerate-all-dynamic-content) -You can use [Ansible Generator](https://github.com/robertdebock/ansible-generator) to regenerate all dynamic content. +You can use [Ansible Generator](https://github.com/mullholland/ansible-generator) to regenerate all dynamic content. If you don't do it, I'll do it later for you. @@ -73,4 +73,4 @@ Now I'll get a message that you've added some code. Thank you, really. CI starts to test your changes. You can follow the progress on Travis. -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). +Please consider [sponsoring me](https://github.com/sponsors/mullholland). diff --git a/tests/ansible-role-preferences/LICENSE b/tests/ansible-role-preferences/LICENSE index 4e25a26..a04e2ac 100644 --- a/tests/ansible-role-preferences/LICENSE +++ b/tests/ansible-role-preferences/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2023 Robert de Bock (robert@meinit.nl) + Copyright 2023 Mullholland (mullholland) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/ansible-role-preferences/molecule/default/molecule.yml b/tests/ansible-role-preferences/molecule/default/molecule.yml index eab24bb..2510b8a 100644 --- a/tests/ansible-role-preferences/molecule/default/molecule.yml +++ b/tests/ansible-role-preferences/molecule/default/molecule.yml @@ -15,7 +15,7 @@ driver: name: docker platforms: - name: "preferences-${image:-fedora}-${tag:-latest}${TOX_ENVNAME}" - image: "${namespace:-robertdebock}/${image:-fedora}:${tag:-latest}" + image: "${namespace:-mullholland}/docker-${image:-fedora}-systemd:${tag:-latest}" command: /sbin/init volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro @@ -23,5 +23,8 @@ platforms: pre_build_image: yes provisioner: name: ansible + env: + VAULT_LICENCE: "${VAULT_LICENCE}" + someTHING: "${someTHING}" verifier: name: ansible diff --git a/tests/ansible-role-version/.ansible-lint b/tests/ansible-role-version/.ansible-lint index 4aa401e..0cce1c4 100644 --- a/tests/ansible-role-version/.ansible-lint +++ b/tests/ansible-role-version/.ansible-lint @@ -12,3 +12,9 @@ exclude_paths: - ./.cache - ./.github - ./requirements.yml + +skip_list: + - yaml[truthy] + +enable_list: + - name[prefix] diff --git a/tests/ansible-role-version/.github/ISSUE_TEMPLATE/bug_report.md b/tests/ansible-role-version/.github/ISSUE_TEMPLATE/bug_report.md index 4bb9d98..f8b0654 100644 --- a/tests/ansible-role-version/.github/ISSUE_TEMPLATE/bug_report.md +++ b/tests/ansible-role-version/.github/ISSUE_TEMPLATE/bug_report.md @@ -28,5 +28,3 @@ Show at least the error, possible related output, maybe just all the output. - 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`) - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/tests/ansible-role-version/.github/ISSUE_TEMPLATE/feature_request.md b/tests/ansible-role-version/.github/ISSUE_TEMPLATE/feature_request.md index 55a93c4..e0512b0 100644 --- a/tests/ansible-role-version/.github/ISSUE_TEMPLATE/feature_request.md +++ b/tests/ansible-role-version/.github/ISSUE_TEMPLATE/feature_request.md @@ -15,5 +15,3 @@ Why is this feature required? ## Additional context Add any other context about the feature request here. - -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). diff --git a/tests/ansible-role-version/.github/dependabot.yml b/tests/ansible-role-version/.github/dependabot.yml new file mode 100644 index 0000000..48728ca --- /dev/null +++ b/tests/ansible-role-version/.github/dependabot.yml @@ -0,0 +1,17 @@ +--- +# +# Ansible managed +# + +# Set update schedule for GitHub Actions + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "daily" + assignees: + - "mullholland" diff --git a/tests/ansible-role-version/.github/workflows/galaxy.yml b/tests/ansible-role-version/.github/workflows/galaxy.yml index 092e544..1f8d455 100644 --- a/tests/ansible-role-version/.github/workflows/galaxy.yml +++ b/tests/ansible-role-version/.github/workflows/galaxy.yml @@ -13,6 +13,6 @@ jobs: runs-on: ubuntu-20.04 steps: - name: galaxy - uses: robertdebock/galaxy-action@1.2.0 + uses: robertdebock/galaxy-action@1.2.1 with: galaxy_api_key: ${{ secrets.galaxy_api_key }} diff --git a/tests/ansible-role-version/.github/workflows/go-semantic-release.yml b/tests/ansible-role-version/.github/workflows/go-semantic-release.yml new file mode 100644 index 0000000..dd21067 --- /dev/null +++ b/tests/ansible-role-version/.github/workflows/go-semantic-release.yml @@ -0,0 +1,28 @@ +--- +# +# Ansible managed +# + +name: Create a semantic release on push to main + +on: + push: + branches: + - "main" + +# If a 403 error occurs, make sure to set content permission to write +# see: https://github.com/go-semantic-release/action/issues/27 +permissions: + contents: write + +jobs: + release: + runs-on: ubuntu-latest + needs: test + steps: + - uses: actions/checkout@v2 + - uses: go-semantic-release/action@v1 + id: semrel + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + changelog-generator-opt: "emojis=true" diff --git a/tests/ansible-role-version/.github/workflows/molecule.yml b/tests/ansible-role-version/.github/workflows/molecule.yml index f229245..7474830 100644 --- a/tests/ansible-role-version/.github/workflows/molecule.yml +++ b/tests/ansible-role-version/.github/workflows/molecule.yml @@ -11,7 +11,7 @@ on: - '*' pull_request: schedule: - - cron: '9 5 5 * *' + - cron: '43 22 22 * *' jobs: lint: @@ -39,11 +39,11 @@ jobs: tag: "latest" - image: "debian" tag: "bookworm" - - image: "enterpriselinux" + - image: "centos" tag: "7" - - image: "enterpriselinux" + - image: "centos" tag: "8" - - image: "enterpriselinux" + - image: "centos" tag: "latest" - image: "fedora" tag: "36" @@ -69,7 +69,8 @@ jobs: - name: parse apparmor for mysql run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - name: molecule - uses: robertdebock/molecule-action@5.0.2 + uses: robertdebock/molecule-action@5.0.3 with: + namespace: mullholland image: ${{ matrix.config.image }} tag: ${{ matrix.config.tag }} diff --git a/tests/ansible-role-version/.gitlab-ci.yml b/tests/ansible-role-version/.gitlab-ci.yml index 9faf38e..634f9db 100644 --- a/tests/ansible-role-version/.gitlab-ci.yml +++ b/tests/ansible-role-version/.gitlab-ci.yml @@ -1,5 +1,5 @@ --- -image: "robertdebock/github-action-molecule:5.0.0" +image: "robertdebock/github-action-molecule:5.0.2" variables: PY_COLORS: 1 @@ -22,11 +22,11 @@ molecule: tag: "latest" - image: "debian" tag: "bookworm" - - image: "enterpriselinux" + - image: "centos" tag: "7" - - image: "enterpriselinux" + - image: "centos" tag: "8" - - image: "enterpriselinux" + - image: "centos" tag: "latest" - image: "fedora" tag: "36" @@ -45,6 +45,6 @@ molecule: galaxy: script: - - ansible-galaxy role import --api-key ${GALAXY_API_KEY} robertdebock ${CI_PROJECT_NAME} + - ansible-galaxy role import --api-key ${GALAXY_API_KEY} mullholland ${CI_PROJECT_NAME} rules: - if: $CI_COMMIT_TAG != null diff --git a/tests/ansible-role-version/.semrelrc b/tests/ansible-role-version/.semrelrc new file mode 100644 index 0000000..c005655 --- /dev/null +++ b/tests/ansible-role-version/.semrelrc @@ -0,0 +1,19 @@ +{ + "plugins": { + "commit-analyzer": { + "name": "default@^1.0.0" + }, + "ci-condition": { + "name": "default" + }, + "changelog-generator": { + "name": "default", + "options": { + "emojis": "true" + } + }, + "provider": { + "name": "github" + } + } +} diff --git a/tests/ansible-role-version/CONTRIBUTING.md b/tests/ansible-role-version/CONTRIBUTING.md index be071a0..2aa9b90 100644 --- a/tests/ansible-role-version/CONTRIBUTING.md +++ b/tests/ansible-role-version/CONTRIBUTING.md @@ -2,7 +2,7 @@ You can really make a difference by: -- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Arobertdebock+is%3Aissue+state%3Aopen).) +- [Making an issue](https://help.github.com/articles/creating-an-issue/). A well described issue helps a lot. (Have a look at the [known issues](https://github.com/search?q=user%3Amullholland+is%3Aissue+state%3Aopen).) - [Making a pull request](https://services.github.com/on-demand/github-cli/open-pull-request-github) when you see the error in code. I'll try to help and take every contribution seriously. @@ -15,13 +15,13 @@ Here is how you can help, a lot of steps are related to GitHub, not specifically ### [1. Make an issue.](#1-make-an-issue) -When you spot an issue, [create an issue](https://github.com/robertdebock/ansible-role-version/issues). +When you spot an issue, [create an issue](https://github.com/mullholland/ansible-role-version/issues). Making the issue help me and others to find similar problems in the future. ### [2. Fork the project.](#2-fork-the-project) -On the top right side of [the repository on GitHub](https://github.com/robertdebock/ansible-role-version), click `fork`. This copies everything to your GitHub namespace. +On the top right side of [the repository on GitHub](https://github.com/mullholland/ansible-role-version), click `fork`. This copies everything to your GitHub namespace. ### [3. Make the changes](#3-make-the-changes) @@ -57,7 +57,7 @@ image=centos tag=7 tox ### [5. Optionally: Regenerate all dynamic content](#5-optionally-regenerate-all-dynamic-content) -You can use [Ansible Generator](https://github.com/robertdebock/ansible-generator) to regenerate all dynamic content. +You can use [Ansible Generator](https://github.com/mullholland/ansible-generator) to regenerate all dynamic content. If you don't do it, I'll do it later for you. @@ -73,4 +73,4 @@ Now I'll get a message that you've added some code. Thank you, really. CI starts to test your changes. You can follow the progress on Travis. -Please consider [sponsoring me](https://github.com/sponsors/robertdebock). +Please consider [sponsoring me](https://github.com/sponsors/mullholland). diff --git a/tests/ansible-role-version/LICENSE b/tests/ansible-role-version/LICENSE index 4e25a26..a04e2ac 100644 --- a/tests/ansible-role-version/LICENSE +++ b/tests/ansible-role-version/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2023 Robert de Bock (robert@meinit.nl) + Copyright 2023 Mullholland (mullholland) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/ansible-role-version/molecule/default/molecule.yml b/tests/ansible-role-version/molecule/default/molecule.yml index 145685b..fbbafa1 100644 --- a/tests/ansible-role-version/molecule/default/molecule.yml +++ b/tests/ansible-role-version/molecule/default/molecule.yml @@ -15,7 +15,7 @@ driver: name: docker platforms: - name: "version-${image:-fedora}-${tag:-latest}${TOX_ENVNAME}" - image: "${namespace:-robertdebock}/${image:-fedora}:${tag:-latest}" + image: "${namespace:-mullholland}/docker-${image:-fedora}-systemd:${tag:-latest}" command: /sbin/init volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro diff --git a/vars/main.yml b/vars/main.yml index 2afcb36..8805fce 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -7,7 +7,7 @@ platform_image_mapping: Amazon: amazonlinux Archlinux: archlinux Debian: debian - EL: enterpriselinux + EL: centos Fedora: fedora opensuse: opensuse Ubuntu: ubuntu