From 542e1d609d82c7390741c172b4882d05141c30c2 Mon Sep 17 00:00:00 2001 From: Thilo Wening Date: Wed, 18 Jan 2023 11:20:19 +0100 Subject: [PATCH 1/7] add builds on fix,feature and main branch --- .github/workflows/molecule.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 2e581449..f4045648 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -6,7 +6,14 @@ on: - v* branches: - main + - 'feature/**' + - 'fix/**' + - '!doc/**' pull_request: + branches: + - 'feature/**' + - 'fix/**' + - '!doc/**' jobs: build: From 3d18a8492d03b6a10d753834ef4ef49ab960b3e1 Mon Sep 17 00:00:00 2001 From: Thilo Wening Date: Wed, 18 Jan 2023 11:20:35 +0100 Subject: [PATCH 2/7] remove requirements from cluster-oss scenario --- molecule/cluster-oss/requirements.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 molecule/cluster-oss/requirements.yml diff --git a/molecule/cluster-oss/requirements.yml b/molecule/cluster-oss/requirements.yml deleted file mode 100644 index ed97d539..00000000 --- a/molecule/cluster-oss/requirements.yml +++ /dev/null @@ -1 +0,0 @@ ---- From 21824ef6cb61ff6b5506187dbe1f50b288548463 Mon Sep 17 00:00:00 2001 From: Thilo Wening Date: Wed, 18 Jan 2023 11:39:44 +0100 Subject: [PATCH 3/7] fix no-security build --- molecule/no-security/converge.yml | 2 ++ molecule/no-security/requirements.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 molecule/no-security/requirements.yml diff --git a/molecule/no-security/converge.yml b/molecule/no-security/converge.yml index d3812c2b..70361213 100644 --- a/molecule/no-security/converge.yml +++ b/molecule/no-security/converge.yml @@ -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 diff --git a/molecule/no-security/requirements.yml b/molecule/no-security/requirements.yml deleted file mode 100644 index ed97d539..00000000 --- a/molecule/no-security/requirements.yml +++ /dev/null @@ -1 +0,0 @@ ---- From b7aff9c724570122e1b129b6747c8a662b9d86bb Mon Sep 17 00:00:00 2001 From: Thilo Wening Date: Wed, 18 Jan 2023 11:55:59 +0100 Subject: [PATCH 4/7] remove lint --- molecule/no-security/molecule.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/molecule/no-security/molecule.yml b/molecule/no-security/molecule.yml index d82ee30f..f980152b 100644 --- a/molecule/no-security/molecule.yml +++ b/molecule/no-security/molecule.yml @@ -18,7 +18,3 @@ provisioner: name: ansible verifier: name: ansible -lint: | - set -e - yamllint . - ansible-lint . From 77b5287a9636b15dcc35d666a019a9585bfa5ed9 Mon Sep 17 00:00:00 2001 From: Thilo Wening Date: Wed, 18 Jan 2023 12:50:37 +0100 Subject: [PATCH 5/7] add cgroup volumes to platforms --- molecule/kibana_full_stack-oss/molecule.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/molecule/kibana_full_stack-oss/molecule.yml b/molecule/kibana_full_stack-oss/molecule.yml index f4585251..2e39979a 100644 --- a/molecule/kibana_full_stack-oss/molecule.yml +++ b/molecule/kibana_full_stack-oss/molecule.yml @@ -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: From 770b71232ba2c8997d4cbdbd991a23d83ce773fe Mon Sep 17 00:00:00 2001 From: Thilo Wening Date: Wed, 18 Jan 2023 13:03:08 +0100 Subject: [PATCH 6/7] move the failing test first --- .github/workflows/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index f4045648..accc7667 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -27,7 +27,7 @@ jobs: max-parallel: 1 matrix: distro: [ubuntu2204] - scenario: [default, cluster, cluster-oss, no-security, kibana_full_stack-oss] + scenario: [kibana_full_stack-oss, default, cluster, cluster-oss, no-security] steps: - name: Check out code From a8ae778c6ab59e3d65a94c1408630b1b1cd06cf7 Mon Sep 17 00:00:00 2001 From: Thilo Wening Date: Wed, 18 Jan 2023 13:56:28 +0100 Subject: [PATCH 7/7] remove failing build --- .github/workflows/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index accc7667..e830bdea 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -27,7 +27,7 @@ jobs: max-parallel: 1 matrix: distro: [ubuntu2204] - scenario: [kibana_full_stack-oss, default, cluster, cluster-oss, no-security] + scenario: [default, cluster, cluster-oss, no-security] steps: - name: Check out code