Merge pull request #69 from MonolithProjects/develop

Fix for Labels

Author: MonolithProjects

molecule/default/verify.yml

@@ -32,4 +32,9 @@
         that:
           - runner_name in registered_runners.json.runners|map(attribute='name')|list
           - registered_runners.json.runners|map(attribute='status') == ["online"]
-        quiet: true
+        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'])) != ([])

molecule/repo/verify.yml

@@ -39,3 +39,8 @@
 
     - 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'])) != ([])

tasks/install_runner.yml

@@ -89,7 +89,7 @@
 
 - name: Register runner (if new installation) for organization
   command: "{{ runner_dir }}/./config.sh --url {{ github_url }}/{{ github_owner | default(github_account) }} \
-            --token {{ registration.json.token }} --name {{ runner_name }} --labels {{ runner_labels }} --unattended"
+            --token {{ registration.json.token }} --name {{ runner_name }} --labels {{ runner_labels | join(',') }} --unattended"
   args:
     chdir: "{{ runner_dir }}"
   become: yes
@@ -101,7 +101,7 @@
 
 - name: Replace registered runner for repo
   command: "{{ runner_dir }}/config.sh --url {{ github_url }}/{{ github_owner | default(github_account) }}/{{ github_repo }} \
-            --token {{ registration.json.token }} --name {{ runner_name }} --labels {{ runner_labels }} --unattended --replace"
+            --token {{ registration.json.token }} --name {{ runner_name }} --labels {{ runner_labels | join(',') }} --unattended --replace"
   args:
     chdir: "{{ runner_dir }}"
   become: yes
@@ -113,7 +113,7 @@
 
 - name: Replace registered runner for organization
   command: "{{ runner_dir }}/config.sh --url {{ github_url }}/{{ github_owner | default(github_account) }} \
-            --token {{ registration.json.token }} --name {{ runner_name }} --labels {{ runner_labels }} --unattended --replace"
+            --token {{ registration.json.token }} --name {{ runner_name }} --labels {{ runner_labels | join(',') }} --unattended --replace"
   args:
     chdir: "{{ runner_dir }}"
   become: yes