Merge pull request #46 from MonolithProjects/develop

Installation idempotence fix

Author: MonolithProjects

.github/workflows/main.yml

@@ -11,7 +11,8 @@ on:
     schedule:
         - cron: '0 6 * * 0'
 jobs:
-  test:
+  repo:
+    name: Test Repo Runner
     runs-on: ubuntu-18.04
     strategy:
       fail-fast: true
@@ -26,6 +27,16 @@ jobs:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:
           molecule_command: test
+  org:
+    name: Test Org Runner
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: true
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          path: "${{ github.repository }}"
       - name: Molecule for Ansible - GHR Organization
         uses: MonolithProjects/[email protected]
         env:

molecule/default/converge.yml

@@ -12,15 +12,14 @@
     - robertdebock.epel
     - ansible-github_actions_runner
 
-- name: Reinstall
+- name: Idempotence test
   user: ansible
   hosts: all
   become: yes
   vars:
     - runner_user: ansible
     - github_repo: ansible-github_actions_runner-testrepo
     - github_account: monolithprojects
-    - reinstall_runner: yes
     - runner_version: "latest"
   roles:
     - robertdebock.epel

molecule/organization/converge.yml

@@ -8,7 +8,7 @@
     - github_account: monolithprojects-testorg
     - runner_org: yes
     - runner_state: "stopped"
-    - runner_version: "2.274.1"
+    - runner_version: "2.274.2"
   roles:
     - robertdebock.epel
     - ansible-github_actions_runner

tasks/install_runner.yml

@@ -109,7 +109,7 @@
   become: yes
   become_user: "{{ runner_user }}"
   no_log: "{{ hide_sensitive_logs | bool }}"
-  when: runner_name in registered_runners.json.runners|map(attribute='name')|list and not runner_org
+  when: runner_name in registered_runners.json.runners|map(attribute='name')|list and reinstall_runner and not runner_org
   tags:
     - install
 
@@ -121,7 +121,7 @@
   become: yes
   become_user: "{{ runner_user }}"
   no_log: "{{ hide_sensitive_logs | bool }}"
-  when: runner_name in registered_runners.json.runners|map(attribute='name')|list and runner_org
+  when: runner_name in registered_runners.json.runners|map(attribute='name')|list and reinstall_runner and runner_org
   tags:
     - install