Skip to content

Commit e85c21a

Browse files
Remove elasticsearch OSS job and related molecule (#447)
- Remove elasticsearch no secuerity workflow and molecule, needed only in version 7 - Remove elasticsearch OSS workflow, needed only in version 7 - Remove all 7 version workflow tests - Remove logstash_full_stack-oss scenario and its workflow - Remove some release 7 related tasks in molecule - Remove the daily running full stack workflow - Fix #434
1 parent f8c5da8 commit e85c21a

25 files changed

Lines changed: 1 addition & 527 deletions

.github/workflows/test_full_stack.yml

Lines changed: 0 additions & 79 deletions
This file was deleted.

.github/workflows/test_role_beats.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
- beats_default
4747
- beats_peculiar
4848
release:
49-
- 7
5049
- 8
5150
ansible_version:
5251
- "ansible>=9.0,<10.0" #Correspond ansible-core>=2.16,<2.17

.github/workflows/test_role_elasticsearch.yml

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
- elasticsearch_default
4747
- elasticsearch_roles_calculation
4848
release:
49-
- 7
5049
- 8
5150
ansible_version:
5251
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
@@ -82,54 +81,3 @@ jobs:
8281
ELASTIC_RELEASE: ${{ matrix.release }}
8382
PY_COLORS: '1'
8483
ANSIBLE_FORCE_COLOR: '1'
85-
86-
molecule_elasticsearch_release7:
87-
needs: lint_elasticsearch
88-
runs-on: ubuntu-latest
89-
90-
env:
91-
COLLECTION_NAMESPACE: netways
92-
COLLECTION_NAME: elasticstack
93-
94-
strategy:
95-
fail-fast: false
96-
matrix:
97-
distro:
98-
- ubuntu2204
99-
scenario:
100-
- elasticsearch_cluster-oss # OSS variant discontinued in ES 8
101-
- elasticsearch_no-security # security mandatory in ES 8
102-
ansible_version:
103-
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
104-
python_version:
105-
- "3.11"
106-
steps:
107-
- name: Check out code
108-
uses: actions/checkout@v6
109-
110-
- name: Set up Python ${{ matrix.python_version }}
111-
uses: actions/setup-python@v6
112-
with:
113-
python-version: ${{ matrix.python_version }}
114-
115-
- name: Install dependencies
116-
run: |
117-
python3 -m pip install --upgrade pip
118-
python3 -m pip install "${{ matrix.ansible_version }}"
119-
python3 -m pip install -r requirements-test.txt
120-
121-
- name: Install collection
122-
run: |
123-
mkdir -p ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE
124-
cp -a ../ansible-collection-$COLLECTION_NAME ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME
125-
126-
- name: Test with molecule
127-
run: |
128-
ansible --version
129-
molecule --version
130-
molecule test -s ${{ matrix.scenario }}
131-
env:
132-
MOLECULE_DISTRO: ${{ matrix.distro }}
133-
ELASTIC_RELEASE: "7"
134-
PY_COLORS: '1'
135-
ANSIBLE_FORCE_COLOR: '1'

.github/workflows/test_role_kibana.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
scenario:
4747
- kibana_default
4848
release:
49-
- 7
5049
- 8
5150
ansible_version:
5251
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0

.github/workflows/test_role_logstash.yml

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
- logstash_specific_version
4747
- logstash_pipelines
4848
release:
49-
- 7
5049
- 8
5150
ansible_version:
5251
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
@@ -83,53 +82,3 @@ jobs:
8382
PY_COLORS: '1'
8483
ANSIBLE_FORCE_COLOR: '1'
8584
ELASTIC_RELEASE: ${{ matrix.release }}
86-
87-
molecule_logstash_oss:
88-
runs-on: ubuntu-latest
89-
needs: lint_logstash
90-
91-
env:
92-
COLLECTION_NAMESPACE: netways
93-
COLLECTION_NAME: elasticstack
94-
95-
strategy:
96-
fail-fast: false
97-
matrix:
98-
distro: [ubuntu2204]
99-
ansible_version:
100-
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
101-
python_version:
102-
- "3.11"
103-
scenario:
104-
- logstash_full_stack-oss
105-
106-
steps:
107-
- name: Check out code
108-
uses: actions/checkout@v6
109-
110-
- name: Set up Python ${{ matrix.python_version }}
111-
uses: actions/setup-python@v6
112-
with:
113-
python-version: ${{ matrix.python_version }}
114-
115-
- name: Install dependencies
116-
run: |
117-
python3 -m pip install --upgrade pip
118-
python3 -m pip install "${{ matrix.ansible_version }}"
119-
python3 -m pip install -r requirements-test.txt
120-
121-
- name: Install collection
122-
run: |
123-
mkdir -p ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE
124-
cp -a ../ansible-collection-$COLLECTION_NAME ~/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME
125-
126-
- name: Test with molecule
127-
run: |
128-
ansible --version
129-
molecule --version
130-
molecule test -s ${{ matrix.scenario }}
131-
env:
132-
MOLECULE_DISTRO: ${{ matrix.distro }}
133-
PY_COLORS: '1'
134-
ANSIBLE_FORCE_COLOR: '1'
135-
ELASTIC_RELEASE: "7" # OSS variant discontinued in ES 8

.github/workflows/test_role_repos.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
- repos_default
5050
- repos_oss
5151
release:
52-
- 7
5352
- 8
5453
ansible_version:
5554
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0

.github/workflows/test_roles_pr.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ on:
1717

1818
jobs:
1919
lint_full:
20-
# test
2120
if: github.event.pull_request.draft == false
2221
uses: ./.github/workflows/test_linting.yml
2322
with:
@@ -40,7 +39,6 @@ jobs:
4039
scenario:
4140
- elasticstack_default
4241
release:
43-
- 7
4442
- 8
4543
python_version:
4644
- "3.11"

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Ansible Collection - netways.elasticstack
22

3-
![Test ElasticStack](https://github.com/NETWAYS/ansible-collection-elasticstack/actions/workflows/test_full_stack.yml/badge.svg)
43

54
> [!CAUTION]
65
> The current main branch has some breaking changes. Be careful using it! Everything after commit 3d6673f6d526afeb0fd7ba382d067d76bd10bbd6 is affected!

molecule/beats_peculiar/converge.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@
4040
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
4141
tasks:
4242

43-
- name: Set Filebeat version for 7.x
44-
ansible.builtin.set_fact:
45-
elasticstack_version: "7.17.1"
46-
when:
47-
- elasticstack_release == 7
48-
4943
- name: Set Filebeat version for 8.x
5044
ansible.builtin.set_fact:
5145
elasticstack_version: "8.4.1"

molecule/elasticsearch_cluster-oss/converge.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)