Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ on:
- v*
branches:
- main
- 'feature/**'
- 'fix/**'
- '!doc/**'
pull_request:
branches:
- 'feature/**'
- 'fix/**'
- '!doc/**'

jobs:
build:
Expand All @@ -20,7 +27,7 @@ jobs:
max-parallel: 1
matrix:
distro: [ubuntu2204]
scenario: [default, cluster, cluster-oss, no-security, kibana_full_stack-oss]
scenario: [default, cluster, cluster-oss, no-security]

steps:
- name: Check out code
Expand Down
1 change: 0 additions & 1 deletion molecule/cluster-oss/requirements.yml

This file was deleted.

4 changes: 3 additions & 1 deletion molecule/kibana_full_stack-oss/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ platforms:
- name: kibana-full-oss
groups:
- elasticsearch
- kibana
image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true
pre_build_image: true
provisioner:
Expand Down
2 changes: 2 additions & 0 deletions molecule/no-security/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# The workaround for arbitrarily named role directory is important because the git repo has one name and the role within it another
# Found at: https://github.com/ansible-community/molecule/issues/1567#issuecomment-436876722
- name: Converge
collections:
- NETWAYS.elasticstack
hosts: all
vars:
elasticsearch_security: false
Expand Down
4 changes: 0 additions & 4 deletions molecule/no-security/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint .
ansible-lint .
1 change: 0 additions & 1 deletion molecule/no-security/requirements.yml

This file was deleted.