Skip to content

Commit 50b6497

Browse files
committed
Merge branch 'main' of github.com:NETWAYS/ansible-collection-elasticstack into main
2 parents 905b6dc + d9ede51 commit 50b6497

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

.github/workflows/molecule.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ on:
66
- v*
77
branches:
88
- main
9+
- 'feature/**'
10+
- 'fix/**'
11+
- '!doc/**'
912
pull_request:
13+
branches:
14+
- 'feature/**'
15+
- 'fix/**'
16+
- '!doc/**'
1017

1118
jobs:
1219
build:
@@ -20,7 +27,7 @@ jobs:
2027
max-parallel: 1
2128
matrix:
2229
distro: [ubuntu2204]
23-
scenario: [default, cluster, cluster-oss, no-security, kibana_full_stack-oss]
30+
scenario: [default, cluster, cluster-oss, no-security]
2431

2532
steps:
2633
- name: Check out code

molecule/cluster-oss/requirements.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

molecule/kibana_full_stack-oss/molecule.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ platforms:
77
- name: kibana-full-oss
88
groups:
99
- elasticsearch
10-
- kibana
1110
image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
1211
command: ${MOLECULE_DOCKER_COMMAND:-""}
12+
volumes:
13+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
14+
cgroupns_mode: host
1315
privileged: true
1416
pre_build_image: true
1517
provisioner:

molecule/no-security/converge.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# The workaround for arbitrarily named role directory is important because the git repo has one name and the role within it another
33
# Found at: https://github.com/ansible-community/molecule/issues/1567#issuecomment-436876722
44
- name: Converge
5+
collections:
6+
- NETWAYS.elasticstack
57
hosts: all
68
vars:
79
elasticsearch_security: false

molecule/no-security/molecule.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,3 @@ provisioner:
1818
name: ansible
1919
verifier:
2020
name: ansible
21-
lint: |
22-
set -e
23-
yamllint .
24-
ansible-lint .

molecule/no-security/requirements.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)