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

molecule/default/INSTALL.rst

@@ -1,29 +1,15 @@
 ---
-- name: Install
+- name: Dev test playbook
   user: ansible
   hosts: all
   gather_facts: yes
   become: yes
   vars:
     - runner_user: ansible
     - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects
-    - runner_version: "latest"
-    - reinstall_runner: yes
-  roles:
-    - robertdebock.epel
-    - ansible-github_actions_runner
-
-- name: Idempotence test
-  user: ansible
-  hosts: all
-  become: yes
-  gather_facts: yes
-  vars:
-    - runner_user: ansible
-    - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects
+    - github_account: monolithprojects-testorg
     - runner_version: "latest"
+    - runner_labels: "'test1','test2'"
   roles:
     - robertdebock.epel
     - ansible-github_actions_runner

molecule/default/cleanup.yml

@@ -1,42 +1,20 @@
 ---
-driver:
-  name: docker
+provisioner:
+  name: ansible
+  playbooks:
+      converge: converge.yml
+      cleanup: cleanup.yml
+      verify: verify.yml
+dependency:
+  name: galaxy
 lint: |
   yamllint .
-  ansible-lint
+  ansible-lint .
+driver:
+  name: docker
 platforms:
-  - name: CentOS7
-    image: monolithprojects/systemd-centos7:latest
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: yes
-    pre_build_image: yes
-  - name: CentOS8
-    image: monolithprojects/systemd-centos8:latest
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: yes
-    pre_build_image: yes
-  - name: Fedora32
-    image: monolithprojects/systemd-fedora32:latest
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: yes
-    pre_build_image: yes
-  - name: Fedora33
-    image: monolithprojects/systemd-fedora33:latest
+  - name: "${os:-ubuntu16}-${tag:-latest}"
+    image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu16}:${tag:-latest}"
     command: /sbin/init
     tmpfs:
       - /run
@@ -45,70 +23,8 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: yes
     pre_build_image: yes
-  - name: Ubuntu16
-    image: monolithprojects/systemd-ubuntu16:latest
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: yes
-    pre_build_image: yes
-  - name: Ubuntu18
-    image: monolithprojects/systemd-ubuntu18:latest
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: yes
-    pre_build_image: yes
-  - name: Ubuntu20
-    image: monolithprojects/systemd-ubuntu20:latest
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: yes
-    pre_build_image: yes
-  - name: Debian9
-    image: monolithprojects/systemd-debian9:latest
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: yes
-    pre_build_image: yes
-  - name: Debian10
-    image: monolithprojects/systemd-debian10:latest
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: yes
-    pre_build_image: yes
-provisioner:
-  name: ansible
-  playbooks:
-    converge: converge.yml
-    cleanup: cleanup.yml 
-  log: false
 verifier:
-  name: testinfra
-  directory: tests
-dependency:
-  name: galaxy
-  options:
-    ignore-certs: True
-    ignore-errors: True
+  name: ansible
 scenario:
   name: default
   test_sequence:
@@ -117,8 +33,8 @@ scenario:
     - destroy
     - syntax
     - create
-    # - prepare
     - converge
-    # - idempotence
+    - idempotence
+    - verify
     - cleanup
     - destroy

molecule/default/converge.yml

@@ -1,3 +1,3 @@
 ---
 - role: robertdebock.epel
-  version: 2.5.4
+  version: 3.0.1