Skip to content

Commit 7f6b3a7

Browse files
committed
molecule3
1 parent 9ef88a9 commit 7f6b3a7

File tree

12 files changed

+73
-144
lines changed

12 files changed

+73
-144
lines changed

.github/workflows/molecule.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
name: Ansible Molecule
3+
4+
on:
5+
push:
6+
tags_ignore:
7+
- '*'
8+
pull_request:
9+
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-20.04
13+
steps:
14+
- name: checkout
15+
uses: actions/checkout@v2
16+
with:
17+
path: "${{ github.repository }}"
18+
- name: molecule
19+
uses: robertdebock/[email protected]
20+
with:
21+
command: lint
22+
test:
23+
needs:
24+
- lint
25+
runs-on: ubuntu-20.04
26+
strategy:
27+
fail-fast: false
28+
steps:
29+
- name: checkout
30+
uses: actions/checkout@v2
31+
with:
32+
path: "${{ github.repository }}"
33+
- name: molecule
34+
uses: robertdebock/[email protected]
35+
with:
36+
image: ${{ matrix.config.image }}
37+
tag: ${{ matrix.config.tag }}

.travis.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.yamllint

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,10 @@
11
---
2-
32
extends: default
43

54
rules:
6-
braces:
7-
min-spaces-inside: 0
8-
max-spaces-inside: 1
9-
min-spaces-inside-empty: -1
10-
max-spaces-inside-empty: -1
11-
brackets:
12-
min-spaces-inside: 0
13-
max-spaces-inside: 0
14-
min-spaces-inside-empty: -1
15-
max-spaces-inside-empty: -1
16-
colons:
17-
max-spaces-before: 0
18-
max-spaces-after: 1
19-
commas:
20-
max-spaces-before: 0
21-
min-spaces-after: 1
22-
max-spaces-after: 1
23-
comments:
24-
level: warning
25-
require-starting-space: false
26-
min-spaces-from-content: 2
27-
comments-indentation: disable
28-
document-end: disable
29-
document-start: disable
30-
empty-lines:
31-
max: 2
32-
max-start: 0
33-
max-end: 0
34-
hyphens:
35-
max-spaces-after: 1
36-
indentation:
37-
spaces: consistent
38-
indent-sequences: true
39-
check-multi-line-strings: false
40-
key-duplicates: enable
41-
line-length:
42-
max: 500
43-
allow-non-breakable-words: true
44-
allow-non-breakable-inline-mappings: false
45-
new-line-at-end-of-file: enable
46-
new-lines:
47-
type: unix
48-
trailing-spaces: enable
5+
truthy:
6+
allowed-values: ['true', 'false', 'on']
7+
check-keys: true
8+
9+
ignore: |
10+
.tox/

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# make a local environment and use molecule test
2+
3+
../base:
4+
python3 -m venv ../base
5+
# (source ../base/bin/activate && python3 -m pip install --upgrade pip)
6+
(source ../base/bin/activate && pip3 install -r requirements.txt)
7+
(source ../base/bin/activate && mol test)
8+
9+
clean:
10+
rm -rf ../base

defaults/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1+
---
12
# Software collections offer latest versions of programming languages
23
collections_enabled: true
3-
4-
# When collections is enabled this is set for the major versions in tasks/main.yml
5-
# base_git: rh-git218

molecule/default/Dockerfile.j2

Lines changed: 0 additions & 14 deletions
This file was deleted.

molecule/default/INSTALL.rst

Lines changed: 0 additions & 26 deletions
This file was deleted.
File renamed without changes.

molecule/default/molecule.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ dependency:
44
name: galaxy
55
driver:
66
name: docker
7-
lint:
8-
name: yamllint
7+
lint: |
8+
set -e
9+
yamllint .
10+
ansible-lint
911
platforms:
1012
- name: base-git-centos7
1113
image: milcom/centos7-systemd
@@ -15,17 +17,5 @@ platforms:
1517
privileged: true
1618
provisioner:
1719
name: ansible
18-
config_options:
19-
defaults:
20-
remote_tmp: /tmp
21-
stdout_callback: yaml
22-
playbooks:
23-
converge: playbook.yml
24-
lint:
25-
name: ansible-lint
26-
scenario:
27-
name: default
2820
verifier:
29-
name: goss
30-
lint:
31-
name: yamllint
21+
name: ansible

molecule/default/verify.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
goss_version: v0.3.7
1111
goss_arch: amd64
1212
goss_dst: /usr/local/bin/goss
13+
# yamllint disable-line rule:line-length
1314
goss_sha256sum: 357f5c7f2e7949b412bce44349cd32ab19eb3947255a8ac805f884cc2c326059
15+
# yamllint disable-line rule:line-length
1416
goss_url: "https://github.com/aelsabbahy/goss/releases/download/{{ goss_version }}/goss-linux-{{ goss_arch }}"
1517
goss_test_directory: /tmp
1618
goss_format: tap
@@ -29,17 +31,21 @@
2931
copy:
3032
src: "{{ item }}"
3133
dest: "{{ goss_test_directory }}/{{ item | basename }}"
34+
mode: 0644
3235
with_fileglob:
3336
- "{{ lookup('env', 'MOLECULE_VERIFIER_TEST_DIRECTORY') }}/test_*.yml"
3437

3538
- name: Register test files
3639
shell: "ls {{ goss_test_directory }}/test_*.yml"
40+
changed_when: false
3741
register: test_files
3842

3943
- name: Execute Goss tests
4044
environment:
45+
# yamllint disable-line rule:line-length
4146
PATH: '/opt/rh/rh-git218/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
4247
command: "{{ goss_dst }} -g {{ item }} validate -f {{ goss_format }}"
48+
changed_when: false
4349
register: test_results
4450
with_items: "{{ test_files.stdout_lines }}"
4551

0 commit comments

Comments
 (0)