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
2 changes: 1 addition & 1 deletion .github/workflows/kics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
schedule:
- cron: '15 6 * * 4'
jobs:
kics:
security_scan:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test_plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- '.github/workflows/test_plugins.yml'

jobs:
sanity_ansible_18_19:
sanity_core_2_18_2_19:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
env:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
PY_COLORS: '1'
ANSIBLE_FORCE_COLOR: '1'

sanity_ansible_20:
sanity_core_2_20:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
env:
Expand Down Expand Up @@ -105,10 +105,10 @@ jobs:
PY_COLORS: '1'
ANSIBLE_FORCE_COLOR: '1'

unit-test:
unit_tests:
needs:
- sanity_ansible_18_19
- sanity_ansible_20
- sanity_core_2_18_2_19
- sanity_core_2_20
runs-on: ubuntu-latest
env:
COLLECTION_NAMESPACE: netways
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
ANSIBLE_FORCE_COLOR: '1'

molecule_plugins:
needs: unit-test
needs: unit_tests
runs-on: ubuntu-latest
env:
COLLECTION_NAMESPACE: netways
Expand Down Expand Up @@ -195,8 +195,8 @@ jobs:
ANSIBLE_FORCE_COLOR: '1'
ELASTIC_RELEASE: ${{ matrix.release }}

python-cryptography:
needs: unit-test
cryptography_compatibility:
needs: unit_tests
runs-on: ubuntu-latest
env:
COLLECTION_NAMESPACE: netways
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_role_beats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- debian13
scenario:
- beats_default
- beats_peculiar
- beats_extended
release:
- 8
ansible_version:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_role_logstash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
rolename: logstash


molecule_logstash_extended:
molecule_logstash:
runs-on: ubuntu-latest
needs: lint_logstash

Expand All @@ -39,7 +39,7 @@ jobs:
matrix:
distro: [debian13]
scenario:
- logstash_specific_version
- logstash_pinned_version
- logstash_pipelines
release:
- 8
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test_roles_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ on:
merge_group:

jobs:
lint_full:
lint_collection:
if: github.event.pull_request.draft == false
uses: ./.github/workflows/test_linting.yml
with:
rolename: ''

molecule_full_stack_ansible_19:
molecule_core_2_19:
runs-on: ubuntu-latest
needs: lint_full
needs: lint_collection

env:
COLLECTION_NAMESPACE: netways
Expand Down Expand Up @@ -85,9 +85,9 @@ jobs:
ELASTIC_RELEASE: ${{ matrix.release }}


molecule_full_stack_ansible_20:
molecule_core_2_20:
runs-on: ubuntu-latest
needs: lint_full
needs: lint_collection

env:
COLLECTION_NAMESPACE: netways
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependency:
driver:
name: docker
platforms:
- name: beats_peculiar_${MOLECULE_DISTRO:-debian13}
- name: beats_extended_${MOLECULE_DISTRO:-debian13}
groups:
- elasticsearch
image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian13}-ansible:latest"
Expand Down
File renamed without changes.
31 changes: 28 additions & 3 deletions molecule/plugins/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,33 @@
update_cache: yes
when: ansible_os_family == "Debian"

- name: Install Python dependencies
# Try pip first for up-to-date packages. On PEP 668 systems (e.g. Debian 13),
# pip fails and we fall back to the package manager. If that also fails
# (package not in repos), force pip with break_system_packages as last resort.

- name: Install Python dependencies via pip
ansible.builtin.pip:
name:
- "elasticsearch<9"
- cryptography
ignore_errors: true
register: plugins_pip_installation

- name: Install Python dependencies via package manager
ansible.builtin.package:
name:
- python3-elasticsearch
- python3-cryptography
ignore_errors: true
register: plugins_apt_installation
when: not plugins_pip_installation is succeeded

- name: Install Python dependencies via pip - forced
ansible.builtin.pip:
name:
- "elasticsearch<9" # Version 9+ has breaking API changes incompatible with this collection
- cryptography # latest version; version matrix is tested in the python-cryptography CI job
- "elasticsearch<9"
- cryptography
break_system_packages: true
when:
- not plugins_pip_installation is succeeded
- not plugins_apt_installation is succeeded
Loading