Skip to content

Commit d9e7dc4

Browse files
Feature/workflows names (#461)
Fix #442 Fix pip elasticsearch installation on Debian 13
1 parent 94a6dd8 commit d9e7dc4

16 files changed

Lines changed: 46 additions & 21 deletions

File tree

.github/workflows/kics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
schedule:
1818
- cron: '15 6 * * 4'
1919
jobs:
20-
kics:
20+
security_scan:
2121
if: github.event.pull_request.draft == false
2222
runs-on: ubuntu-latest
2323

.github/workflows/test_plugins.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
- '.github/workflows/test_plugins.yml'
2121

2222
jobs:
23-
sanity_ansible_18_19:
23+
sanity_core_2_18_2_19:
2424
if: github.event.pull_request.draft == false
2525
runs-on: ubuntu-latest
2626
env:
@@ -63,7 +63,7 @@ jobs:
6363
PY_COLORS: '1'
6464
ANSIBLE_FORCE_COLOR: '1'
6565

66-
sanity_ansible_20:
66+
sanity_core_2_20:
6767
if: github.event.pull_request.draft == false
6868
runs-on: ubuntu-latest
6969
env:
@@ -105,10 +105,10 @@ jobs:
105105
PY_COLORS: '1'
106106
ANSIBLE_FORCE_COLOR: '1'
107107

108-
unit-test:
108+
unit_tests:
109109
needs:
110-
- sanity_ansible_18_19
111-
- sanity_ansible_20
110+
- sanity_core_2_18_2_19
111+
- sanity_core_2_20
112112
runs-on: ubuntu-latest
113113
env:
114114
COLLECTION_NAMESPACE: netways
@@ -149,7 +149,7 @@ jobs:
149149
ANSIBLE_FORCE_COLOR: '1'
150150

151151
molecule_plugins:
152-
needs: unit-test
152+
needs: unit_tests
153153
runs-on: ubuntu-latest
154154
env:
155155
COLLECTION_NAMESPACE: netways
@@ -195,8 +195,8 @@ jobs:
195195
ANSIBLE_FORCE_COLOR: '1'
196196
ELASTIC_RELEASE: ${{ matrix.release }}
197197

198-
python-cryptography:
199-
needs: unit-test
198+
cryptography_compatibility:
199+
needs: unit_tests
200200
runs-on: ubuntu-latest
201201
env:
202202
COLLECTION_NAMESPACE: netways

.github/workflows/test_role_beats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- debian13
4141
scenario:
4242
- beats_default
43-
- beats_peculiar
43+
- beats_extended
4444
release:
4545
- 8
4646
ansible_version:

.github/workflows/test_role_logstash.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
rolename: logstash
2727

2828

29-
molecule_logstash_extended:
29+
molecule_logstash:
3030
runs-on: ubuntu-latest
3131
needs: lint_logstash
3232

@@ -39,7 +39,7 @@ jobs:
3939
matrix:
4040
distro: [debian13]
4141
scenario:
42-
- logstash_specific_version
42+
- logstash_pinned_version
4343
- logstash_pipelines
4444
release:
4545
- 8

.github/workflows/test_roles_pr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ on:
2424
merge_group:
2525

2626
jobs:
27-
lint_full:
27+
lint_collection:
2828
if: github.event.pull_request.draft == false
2929
uses: ./.github/workflows/test_linting.yml
3030
with:
3131
rolename: ''
3232

33-
molecule_full_stack_ansible_19:
33+
molecule_core_2_19:
3434
runs-on: ubuntu-latest
35-
needs: lint_full
35+
needs: lint_collection
3636

3737
env:
3838
COLLECTION_NAMESPACE: netways
@@ -85,9 +85,9 @@ jobs:
8585
ELASTIC_RELEASE: ${{ matrix.release }}
8686

8787

88-
molecule_full_stack_ansible_20:
88+
molecule_core_2_20:
8989
runs-on: ubuntu-latest
90-
needs: lint_full
90+
needs: lint_collection
9191

9292
env:
9393
COLLECTION_NAMESPACE: netways
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependency:
66
driver:
77
name: docker
88
platforms:
9-
- name: beats_peculiar_${MOLECULE_DISTRO:-debian13}
9+
- name: beats_extended_${MOLECULE_DISTRO:-debian13}
1010
groups:
1111
- elasticsearch
1212
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian13}-ansible:latest"

0 commit comments

Comments
 (0)