Skip to content

Commit e90103b

Browse files
Merge pull request #73 from MonolithProjects/develop
Better molecule tests
2 parents 55409ce + 961075e commit e90103b

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
path: "${{ github.repository }}"
3737
- name: Molecule for Ansible - GHR Repository
38-
uses: MonolithProjects/[email protected].1
38+
uses: MonolithProjects/[email protected].2
3939
env:
4040
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
4141
with:
@@ -55,7 +55,7 @@ jobs:
5555
with:
5656
path: "${{ github.repository }}"
5757
- name: Molecule for Ansible - GHR Organization
58-
uses: MonolithProjects/[email protected].1
58+
uses: MonolithProjects/[email protected].2
5959
env:
6060
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
6161
with:

molecule/default/verify.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
- registered_runners.json.runners|map(attribute='status') == ["online"]
3535
quiet: true
3636

37-
# - name: Check Labels ### does not work ... will fix the other day :-P
38-
# fail:
39-
# msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['Linux', 'self-hosted', 'X64', 'label1', 'repo-runner'])) }}"
40-
# when: (registered_runners.json.runners.0 | json_query('labels[*].name') | list | difference(['Linux', 'self-hosted', 'X64', 'label1', 'repo-runner'])) != ([])
37+
- name: Check Labels (skipped if labels are OK)
38+
fail:
39+
msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'])) }}"
40+
when: not (registered_runners.json.runners.0 | json_query('labels[*].name') | list ) == (['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'] | list)

molecule/repo/verify.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@
3737
- runner_name in registered_runners.json.runners|map(attribute='name')|list
3838
quiet: true
3939

40-
- debug:
41-
var: registered_runners.json.runners|map(attribute='name')
42-
43-
# - name: Check Labels ### does not work ... will fix the other day :-P
44-
# fail:
45-
# msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['Linux', 'self-hosted', 'X64', 'label1', 'repo-runner'])) }}"
46-
# when: (registered_runners.json.runners.0 | json_query('labels[*].name') | list | difference(['Linux', 'self-hosted', 'X64', 'label1', 'repo-runner'])) != ([])
40+
- name: Check Labels (skipped if labels are OK)
41+
fail:
42+
msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'])) }}"
43+
when: not (registered_runners.json.runners.0 | json_query('labels[*].name') | list ) == (['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'] | list)

tasks/assert.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
- github_account is defined
66
- access_token is defined
77
- access_token | length > 0
8-
quiet: true
8+
fail_msg: "access_token was not fount."
99
run_once: yes
1010
tags:
1111
- install
12-
- uninstall
12+
- uninstall

0 commit comments

Comments
 (0)