Skip to content

Commit c721b78

Browse files
tobiashusteNormo
authored andcommitted
1 parent cc39aa2 commit c721b78

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

molecule/gitlab/molecule.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ provisioner:
2929
inventory:
3030
host_vars:
3131
instancegitlab:
32+
gitlab_version: "17.11.2"
33+
gitlab_release: "ce.0"
3234
gitlab_edition: "gitlab-ce"
3335
gitlab_ip_range: "0.0.0.0/0"
3436
gitlab_additional_configurations:

molecule/gitlab/verify.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,22 @@
1414
- name: "Assert that GitLab Omnibus package is installed"
1515
ansible.builtin.assert:
1616
that:
17-
- "'{{ gitlab_edition }}' in ansible_facts.packages"
17+
- "gitlab_edition in ansible_facts.packages"
1818
when:
1919
- "gitlab_edition is defined"
2020

21+
- name: "Set expected package version of GitLab"
22+
ansible.builtin.set_fact:
23+
gitlab_expected_package_version: "{{ gitlab_version }}-{{ gitlab_release }}"
24+
when:
25+
- "gitlab_edition is defined"
26+
- "gitlab_version is defined"
27+
- "gitlab_release is defined"
28+
2129
- name: "Assert that installed GitLab version is equal to the desired one"
2230
ansible.builtin.assert:
2331
that:
24-
- "ansible_facts.packages['{{ gitlab_edition }}'][0].version == gitlab_version"
25-
- "ansible_facts.packages['{{ gitlab_edition }}'][0].release == gitlab_release"
32+
- "ansible_facts.packages[gitlab_edition][0].version == gitlab_expected_package_version"
2633
when:
2734
- "gitlab_edition is defined"
2835
- "gitlab_version is defined"

0 commit comments

Comments
 (0)