Skip to content
This repository was archived by the owner on May 23, 2024. It is now read-only.

Commit 6575242

Browse files
authored
Merge pull request #53 from christianhueserhzdr/52-include-folder-molecule-in-ansible-lint-call
Lint molecule files via ansible-lint
2 parents b36613d + a1148c8 commit 6575242

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

molecule/default/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ platforms:
1818
- /sys/fs/cgroup:/sys/fs/cgroup:ro
1919
lint: |
2020
yamllint --strict --format colored . &&
21-
ansible-lint -v --force-color --offline --exclude .pipenv/ .
21+
ansible-lint -v --force-color --offline --exclude .pipenv/ . molecule/
2222
provisioner:
2323
name: ansible
2424
playbooks:

molecule/default/prepare.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
- name: Prepare
88
hosts: all
99
tasks:
10-
- when:
10+
- name: Install depenencies for OS family RedHat
11+
when:
1112
- ansible_os_family == 'RedHat'
1213
- ansible_distribution_major_version | int >= 7
1314
block:
@@ -19,7 +20,8 @@
1920
state: present
2021
update_cache: yes
2122

22-
- when: ansible_os_family == 'Debian'
23+
- name: Install depenencies for OS family Debian
24+
when: ansible_os_family == 'Debian'
2325
block:
2426
- name: Install missing dependencies
2527
ansible.builtin.apt:

molecule/default/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
ansible.builtin.uri:
3434
url: "http://localhost/-/health"
3535
register: "health_check"
36-
failed_when: "'OK' not in health_check.msg or health_check.status!=200"
36+
failed_when: "'OK' not in health_check.msg or health_check.status != 200"
3737

3838
- name: "Check GitLab Readiness endpoint"
3939
ansible.builtin.uri:

vars/CentOS.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ gitlab_dependencies:
1212
- yum-utils
1313
gitlab_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_distribution_major_version }}/$basearch"
1414
gitlab_source_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_distribution_major_version }}/SRPMS"
15-
gitlab_package_name: "{{ gitlab_edition + '-' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"
15+
gitlab_package_name: "{{ gitlab_edition + '-' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"

0 commit comments

Comments
 (0)