Merge pull request #66 from MonolithProjects/develop

Better automated tests

Author: MonolithProjects

.github/workflows/galaxy.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: galaxy
         uses: robertdebock/[email protected]

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ on:
         types: [opened, synchronize, reopened]
 jobs:
   lint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
     steps:
@@ -20,6 +20,6 @@ jobs:
         with:
           path: "${{ github.repository }}"
       - name: Molecule for Ansible - lint
-        uses: MonolithProjects/[email protected].0
+        uses: MonolithProjects/[email protected].1
         with:
           molecule_command: lint

.github/workflows/main.yml

@@ -3,41 +3,61 @@ name: molecule test
 on:
     pull_request:
         branches:
-            - master
+            - main
         types: [opened, synchronize, reopened]
     schedule:
         - cron: '0 6 * * 0'
 jobs:
   repo:
     name: Test Repo Runner
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
-      fail-fast: true
+      fail-fast: false
+      matrix:
+        config:
+          - os: "centos7"
+            tag: "latest"
+          - os: "centos8"
+            tag: "latest"
+          - os: "debian9"
+            tag: "latest"
+          - os: "debian10"
+            tag: "latest"
+          - os: "fedora33"
+            tag: "latest"
+          - os: "ubuntu18"
+            tag: "latest"
+          - os: "ubuntu20"
+            tag: "latest"
     steps:
       - name: checkout
         uses: actions/checkout@v2
         with:
           path: "${{ github.repository }}"
       - name: Molecule for Ansible - GHR Repository
-        uses: MonolithProjects/[email protected].0
+        uses: MonolithProjects/[email protected].1
         env:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:
+          os: ${{ matrix.config.os }}
+          tag: ${{ matrix.config.tag }}
           molecule_command: test
+          scenario: repo
+
   org:
     name: Test Org Runner
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
-      fail-fast: true
+      fail-fast: false
     steps:
       - name: checkout
         uses: actions/checkout@v2
         with:
           path: "${{ github.repository }}"
       - name: Molecule for Ansible - GHR Organization
-        uses: MonolithProjects/[email protected].0
+        uses: MonolithProjects/[email protected].1
         env:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:
           molecule_command: test
-          scenario: organization
+          scenario: org

CONTRIBUTING.md

@@ -31,9 +31,10 @@ cd ansible-github_actions_runner
 molecule test
 ```
 
+> You will need to edit the files in `molecule/default` directory (please do not commit those changes)
+
 ## 5. Create a pull request
 
 Please create a pull request into the `develop` branch. Here is [how to do it](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
 
-
 Please consider to [sponsor](https://github.com/sponsors/monolithprojects) me :-)

README.md

@@ -32,7 +32,7 @@ Personal Access Token for GitHub account can be created [here](https://github.co
 
 * ARM, ARM64 (dependencies installation is not covered by this role)
 * AMD64, x86_64
-## Weekly tested on:
+## Tested on:
 
 * CentOS/RHEL 7,8
 * Debian 9,10
@@ -82,7 +82,7 @@ runner_org: no
 # Name to assign to this runner in GitHub (System hostname as default)
 runner_name: "{{ ansible_hostname }}"
 
-# Labels to apply to the runner
+# Labels to apply to the runner. For examle "'label1','label2'"
 runner_labels: "''"
 
 # Custom service name when usign Github Enterprise server

defaults/main.yml

@@ -35,7 +35,7 @@ runner_org: no
 # Name to assign to this runner in GitHub (System hostname as default)
 runner_name: "{{ ansible_hostname }}"
 
-# Labels to apply to the runner
+# Labels to apply to the runner. For examle "'label1','label2'"
 runner_labels: "''"
 
 # Custom service name when usign Github Enterprise server

handlers/main.yml

@@ -1,5 +1,5 @@
 ---
-# handlers file for ansible-github_actions_runner
+# handlers file for ansible-github_actions_runner (currently not used)
 - name: Restart runner service
   service:
    name: "{{ runner_service }}"

molecule/default/Dockerfile.j2

@@ -6,7 +6,7 @@
   vars:
     - runner_user: ansible
     - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects
+    - github_account: monolithprojects-testorg
     - runner_state: absent
   roles:
     - ansible-github_actions_runner