Merge pull request #73 from MonolithProjects/develop

Better molecule tests
MonolithProjects · Apr 3, 2021 · e90103b · e90103b
2 parents 55409ce + 961075e
commit e90103b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           path: "${{ github.repository }}"
       - name: Molecule for Ansible - GHR Repository
-        uses: MonolithProjects/action-molecule@v1.4.1
+        uses: MonolithProjects/action-molecule@v1.4.2
         env:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:
@@ -55,7 +55,7 @@ jobs:
         with:
           path: "${{ github.repository }}"
       - name: Molecule for Ansible - GHR Organization
-        uses: MonolithProjects/action-molecule@v1.4.1
+        uses: MonolithProjects/action-molecule@v1.4.2
         env:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -34,7 +34,7 @@
           - registered_runners.json.runners|map(attribute='status') == ["online"]
         quiet: true
 
-    # - name: Check Labels  ### does not work ... will fix the other day :-P
-    #   fail: 
-    #     msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['Linux', 'self-hosted', 'X64', 'label1', 'repo-runner'])) }}"
-    #   when: (registered_runners.json.runners.0 | json_query('labels[*].name') | list  | difference(['Linux', 'self-hosted', 'X64', 'label1', 'repo-runner'])) != ([])
+    - name: Check Labels (skipped if labels are OK)
+      fail: 
+        msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'])) }}"
+      when: not (registered_runners.json.runners.0 | json_query('labels[*].name') | list ) == (['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'] | list)
diff --git a/molecule/repo/verify.yml b/molecule/repo/verify.yml
@@ -37,10 +37,7 @@
           - runner_name in registered_runners.json.runners|map(attribute='name')|list
         quiet: true
 
-    - debug:
-        var: registered_runners.json.runners|map(attribute='name')
-
-    # - name: Check Labels  ### does not work ... will fix the other day :-P
-    #   fail: 
-    #     msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['Linux', 'self-hosted', 'X64', 'label1', 'repo-runner'])) }}"
-    #   when: (registered_runners.json.runners.0 | json_query('labels[*].name') | list  | difference(['Linux', 'self-hosted', 'X64', 'label1', 'repo-runner'])) != ([])
+    - name: Check Labels (skipped if labels are OK)
+      fail: 
+        msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'])) }}"
+      when: not (registered_runners.json.runners.0 | json_query('labels[*].name') | list ) == (['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'] | list)
diff --git a/tasks/assert.yml b/tasks/assert.yml
@@ -5,8 +5,8 @@
       - github_account is defined
       - access_token is defined
       - access_token | length > 0
-    quiet: true
+    fail_msg: "access_token was not fount."
   run_once: yes
   tags:
     - install
-    - uninstall
+    - uninstall