From d1311c63a5fa9f430bea7ebb3acc703cdf099beb Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Fri, 27 Mar 2026 13:55:09 +0100 Subject: [PATCH 1/6] Add forgotten draft conditions --- .github/workflows/test_linting.yml | 1 + .github/workflows/test_plugins.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/test_linting.yml b/.github/workflows/test_linting.yml index b13fb8fb..06606ff5 100644 --- a/.github/workflows/test_linting.yml +++ b/.github/workflows/test_linting.yml @@ -23,6 +23,7 @@ on: jobs: lint: + if: github.event.pull_request.draft == false runs-on: ubuntu-latest steps: - name: Check out the codebase. diff --git a/.github/workflows/test_plugins.yml b/.github/workflows/test_plugins.yml index 201e56af..dbc8bc44 100644 --- a/.github/workflows/test_plugins.yml +++ b/.github/workflows/test_plugins.yml @@ -66,6 +66,7 @@ jobs: ANSIBLE_FORCE_COLOR: '1' sanity_ansible_20: + if: github.event.pull_request.draft == false runs-on: ubuntu-latest env: COLLECTION_NAMESPACE: netways From 7b8ad5884ee1e214b7f027903ac9014930ed0e28 Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Fri, 27 Mar 2026 14:44:54 +0100 Subject: [PATCH 2/6] * Add main brach as target branch * add path ignore for the molecule full --- .github/workflows/test_role_beats.yml | 4 +--- .github/workflows/test_role_elasticsearch.yml | 4 +--- .github/workflows/test_role_kibana.yml | 4 +--- .github/workflows/test_role_logstash.yml | 4 +--- .github/workflows/test_role_repos.yml | 4 +--- README.md | 6 ------ 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml index 7ec2b4fb..32cca1bc 100644 --- a/.github/workflows/test_role_beats.yml +++ b/.github/workflows/test_role_beats.yml @@ -14,9 +14,7 @@ on: - debug pull_request: branches: - - 'feature/**' - - 'fix/**' - - '!doc/**' + - 'main' paths: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' diff --git a/.github/workflows/test_role_elasticsearch.yml b/.github/workflows/test_role_elasticsearch.yml index d7f495e3..c755a52d 100644 --- a/.github/workflows/test_role_elasticsearch.yml +++ b/.github/workflows/test_role_elasticsearch.yml @@ -14,9 +14,7 @@ on: - debug pull_request: branches: - - 'feature/**' - - 'fix/**' - - '!doc/**' + - 'main' paths: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml index 9dc56687..4a1c1abf 100644 --- a/.github/workflows/test_role_kibana.yml +++ b/.github/workflows/test_role_kibana.yml @@ -14,9 +14,7 @@ on: - debug pull_request: branches: - - 'feature/**' - - 'fix/**' - - '!doc/**' + - 'main' paths: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml index 2746f398..2dd2e6b8 100644 --- a/.github/workflows/test_role_logstash.yml +++ b/.github/workflows/test_role_logstash.yml @@ -14,9 +14,7 @@ on: - debug pull_request: branches: - - 'feature/**' - - 'fix/**' - - '!doc/**' + - 'main' paths: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml index b2c714be..41b7af9f 100644 --- a/.github/workflows/test_role_repos.yml +++ b/.github/workflows/test_role_repos.yml @@ -13,9 +13,7 @@ on: - debug pull_request: branches: - - 'feature/**' - - 'fix/**' - - '!doc/**' + - 'main' paths: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml' diff --git a/README.md b/README.md index 494ed9dd..e1bfcd67 100644 --- a/README.md +++ b/README.md @@ -221,12 +221,6 @@ The execution order of the roles is important! (see below) Every kind of contribution is very welcome. Open [issues](https://github.com/NETWAYS/ansible-collection-elasticstack/issues) or provide [pull requests](https://github.com/NETWAYS/ansible-collection-elasticstack/pulls). -Please note that we have some actions bound to specific names of branches. So please stick to the following naming scheme: - -* `fix/` as a prefix for every branch that fixes a problem -* `feature/` for every branch that enhances the code with new features -* `doc/` as a prefix for every branch that only changes documentation - For now we open pull requests against `main`. We are planning to introduce dedicated branches to support older versions without breaking changes. Since we don't need them for now, please check back with this section because when we decided on how to proceed, you will find the information here. For now `main` always has the newest changes and if you want a stable version, please use the newest release. ## Testing From 26f71ef0ff915043933e5d1b095e479996af7a84 Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Fri, 27 Mar 2026 14:46:40 +0100 Subject: [PATCH 3/6] Correct the name sapace in kibana workfow --- .github/workflows/test_role_kibana.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml index 4a1c1abf..43948eda 100644 --- a/.github/workflows/test_role_kibana.yml +++ b/.github/workflows/test_role_kibana.yml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest env: - COLLECTION_NAMESPACE: NETWAYS + COLLECTION_NAMESPACE: netways COLLECTION_NAME: elasticstack strategy: From 1668978b7c378edad407e78687b43b9ab12ac474 Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Fri, 27 Mar 2026 14:51:21 +0100 Subject: [PATCH 4/6] Let the lint not to run twice --- .github/workflows/test_linting.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test_linting.yml b/.github/workflows/test_linting.yml index 06606ff5..c8c1497e 100644 --- a/.github/workflows/test_linting.yml +++ b/.github/workflows/test_linting.yml @@ -17,9 +17,6 @@ on: rolename: required: true type: string - pull_request: - branches: - - '*' jobs: lint: From c580b5bf7e5fc0f4d04782a47c2327eed2e45a59 Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Fri, 27 Mar 2026 16:23:45 +0100 Subject: [PATCH 5/6] Change the paths when the big workflow runs --- .github/workflows/test_roles_pr.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml index 705be014..06dfc7bf 100644 --- a/.github/workflows/test_roles_pr.yml +++ b/.github/workflows/test_roles_pr.yml @@ -13,6 +13,14 @@ on: - warning - debug pull_request: + paths: + - 'roles/**' + - 'molecule/elasticstack_default/**' + - 'requirements-test.txt' + - '.yamllint' + - '.config/ansible-lint.yml' + - 'galaxy.yml' + - '.github/workflows/test_roles_pr.yml' merge_group: jobs: From a0e6b9ac813085de84da625d20dd1213c400542b Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Fri, 27 Mar 2026 16:38:35 +0100 Subject: [PATCH 6/6] Remove the filtering on main branch in workflows. good for epic branch --- .github/workflows/kics.yml | 3 --- .github/workflows/test_plugins.yml | 2 -- .github/workflows/test_role_beats.yml | 2 -- .github/workflows/test_role_elasticsearch.yml | 2 -- .github/workflows/test_role_kibana.yml | 2 -- .github/workflows/test_role_logstash.yml | 2 -- .github/workflows/test_role_repos.yml | 2 -- 7 files changed, 15 deletions(-) diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index 4abe9e7e..de93a1eb 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -13,9 +13,6 @@ on: - warning - debug pull_request: - push: - branches: - - 'main' merge_group: schedule: - cron: '15 6 * * 4' diff --git a/.github/workflows/test_plugins.yml b/.github/workflows/test_plugins.yml index dbc8bc44..c043865d 100644 --- a/.github/workflows/test_plugins.yml +++ b/.github/workflows/test_plugins.yml @@ -13,8 +13,6 @@ on: - warning - debug pull_request: - branches: - - 'main' paths: - 'plugins/**' - 'tests/**' diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml index 32cca1bc..f4fce1f9 100644 --- a/.github/workflows/test_role_beats.yml +++ b/.github/workflows/test_role_beats.yml @@ -13,8 +13,6 @@ on: - warning - debug pull_request: - branches: - - 'main' paths: - 'roles/beats/**' - '.github/workflows/test_role_beats.yml' diff --git a/.github/workflows/test_role_elasticsearch.yml b/.github/workflows/test_role_elasticsearch.yml index c755a52d..af73ecc3 100644 --- a/.github/workflows/test_role_elasticsearch.yml +++ b/.github/workflows/test_role_elasticsearch.yml @@ -13,8 +13,6 @@ on: - warning - debug pull_request: - branches: - - 'main' paths: - 'roles/elasticsearch/**' - '.github/workflows/test_role_elasticsearch.yml' diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml index 43948eda..dd11e841 100644 --- a/.github/workflows/test_role_kibana.yml +++ b/.github/workflows/test_role_kibana.yml @@ -13,8 +13,6 @@ on: - warning - debug pull_request: - branches: - - 'main' paths: - 'roles/kibana/**' - '.github/workflows/test_role_kibana.yml' diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml index 2dd2e6b8..9f133ed0 100644 --- a/.github/workflows/test_role_logstash.yml +++ b/.github/workflows/test_role_logstash.yml @@ -13,8 +13,6 @@ on: - warning - debug pull_request: - branches: - - 'main' paths: - 'roles/logstash/**' - '.github/workflows/test_role_logstash.yml' diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml index 41b7af9f..4b9a4bae 100644 --- a/.github/workflows/test_role_repos.yml +++ b/.github/workflows/test_role_repos.yml @@ -12,8 +12,6 @@ on: - warning - debug pull_request: - branches: - - 'main' paths: - 'roles/repos/**' - '.github/workflows/test_role_repos.yml'