Skip to content

Commit 830e737

Browse files
Birger Schachtwaldbauer-certat
authored andcommitted
ENH: use the upstream ansible tasks playbook
This makes the ansible workflow follow the upstream playbook more closely, which reduces duplicate code. To make things easier, the ansible script is now run using podman instead of buildah.
1 parent 1ac2429 commit 830e737

File tree

2 files changed

+3
-23
lines changed

2 files changed

+3
-23
lines changed

.github/workflows/ansible-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
path: ./src/intelmq-vagrant
3434

3535
- name: Run ansible tests
36-
run: buildah run -v ${GITHUB_WORKSPACE}/src:/src $(buildah from docker.io/debian:buster-slim) /src/intelmq/.github/workflows/scripts/ansible.sh
36+
run: podman run -e CI=${CI} -v ${GITHUB_WORKSPACE}/src:/src docker.io/debian:buster-slim /src/intelmq/.github/workflows/scripts/ansible.sh

.github/workflows/scripts/ansible-playbook.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -72,25 +72,5 @@
7272
state: started
7373
name: "{{webserver}}"
7474

75-
# Store the intelmq version in a variable
76-
- name: Get intelmq version
77-
command: intelmqctl --version
78-
register: intelmqversion
79-
- name: Set intelmq_version fact
80-
set_fact:
81-
intelmq_version={{ intelmqversion.stdout }}
82-
- name: Set intelmq_major_version fact
83-
set_fact:
84-
intelmq_major_version={{ intelmqversion.stdout[:1] }}
85-
- name: Print version
86-
debug:
87-
msg: IntelMQ Version {{ intelmq_version }} and IntelMQ Major Version {{ intelmq_major_version }}
88-
89-
- name: Run configuration upgrade
90-
command: intelmqctl upgrade-config -u v300_pipeline_file_removal -f
91-
when:
92-
intelmq_major_version == '3'
93-
94-
- name: Run CLI tests
95-
include: "{{ item }}"
96-
loop: "{{ query('fileglob', '/src/intelmq-vagrant/ansible/tasks/cli/*.yml') | sort }}"
75+
- name: Run tasks
76+
include: "tasks.yml"

0 commit comments

Comments
 (0)