Skip to content

Commit eeeec59

Browse files
Merge pull request #80 from MonolithProjects/develop
Different runner for the test workflows
2 parents a364a9f + b71b789 commit eeeec59

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

.github/workflows/galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
release:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-18.04
1212
steps:
1313
- name: galaxy
1414
uses: robertdebock/[email protected]

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
types: [opened, synchronize, reopened]
1212
jobs:
1313
lint:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-18.04
1515
strategy:
1616
fail-fast: true
1717
steps:
@@ -20,6 +20,6 @@ jobs:
2020
with:
2121
path: "${{ github.repository }}"
2222
- name: Molecule for Ansible - lint
23-
uses: MonolithProjects/[email protected].1
23+
uses: MonolithProjects/[email protected].3
2424
with:
2525
molecule_command: lint

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
repo:
1212
name: Test Repo Runner
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-18.04
1414
strategy:
1515
fail-fast: false
1616
matrix:
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
path: "${{ github.repository }}"
3737
- name: Molecule for Ansible - GHR Repository
38-
uses: MonolithProjects/[email protected].2
38+
uses: MonolithProjects/[email protected].3
3939
env:
4040
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
4141
with:
@@ -46,7 +46,7 @@ jobs:
4646

4747
org:
4848
name: Test Org Runner
49-
runs-on: ubuntu-20.04
49+
runs-on: ubuntu-18.04
5050
strategy:
5151
fail-fast: false
5252
steps:
@@ -55,7 +55,7 @@ jobs:
5555
with:
5656
path: "${{ github.repository }}"
5757
- name: Molecule for Ansible - GHR Organization
58-
uses: MonolithProjects/[email protected].2
58+
uses: MonolithProjects/[email protected].3
5959
env:
6060
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
6161
with:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![Galaxy Quality](https://img.shields.io/ansible/quality/47375?style=flat&logo=ansible)](https://galaxy.ansible.com/monolithprojects/github_actions_runner)
55
[![Role version](https://img.shields.io/github/v/release/MonolithProjects/ansible-github_actions_runner)](https://galaxy.ansible.com/monolithprojects/github_actions_runner)
66
[![Role downloads](https://img.shields.io/ansible/role/d/47375)](https://galaxy.ansible.com/monolithprojects/github_actions_runner)
7-
[![GitHub Actions](https://github.com/MonolithProjects/ansible-github_actions_runner/workflows/molecule%20test/badge.svg?branch=main)](https://github.com/MonolithProjects/ansible-github_actions_runner/actions)
7+
[![GitHub Actions](https://github.com/MonolithProjects/ansible-github_actions_runner/workflows/molecule%20test/badge.svg?branch=master)](https://github.com/MonolithProjects/ansible-github_actions_runner/actions)
88
[![License](https://img.shields.io/github/license/MonolithProjects/ansible-github_actions_runner)](https://github.com/MonolithProjects/ansible-github_actions_runner/blob/main/LICENSE)
99

1010

@@ -36,8 +36,8 @@ Personal Access Token for GitHub account can be created [here](https://github.co
3636

3737
* CentOS/RHEL 7,8
3838
* Debian 9,10
39-
* Fedora 32,33
40-
* Ubuntu 16,18,20
39+
* Fedora 34
40+
* Ubuntu 18,20
4141

4242
**Note:** Fedora 32+ and Ubuntu 20 must use Ansible 2.9.8+. Other distros/releases will work also with older 2.8.0+ Ansible.
4343

molecule/default/molecule.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
22
provisioner:
33
name: ansible
4+
config_options:
5+
defaults:
6+
verbosity: 0
47
playbooks:
58
converge: converge.yml
69
cleanup: cleanup.yml
@@ -13,8 +16,8 @@ lint: |
1316
driver:
1417
name: docker
1518
platforms:
16-
- name: "${os:-ubuntu16}-${tag:-latest}"
17-
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu16}:${tag:-latest}"
19+
- name: "${os:-ubuntu20}-${tag:-latest}"
20+
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
1821
command: /sbin/init
1922
tmpfs:
2023
- /run

0 commit comments

Comments
 (0)