Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH: use the upstream ansible tasks playbook #2089

Merged
1 commit merged into from
Sep 3, 2021
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/ansible-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ jobs:
path: ./src/intelmq-vagrant

- name: Run ansible tests
run: buildah run -v ${GITHUB_WORKSPACE}/src:/src $(buildah from docker.io/debian:buster-slim) /src/intelmq/.github/workflows/scripts/ansible.sh
run: podman run -e CI=${CI} -v ${GITHUB_WORKSPACE}/src:/src docker.io/debian:buster-slim /src/intelmq/.github/workflows/scripts/ansible.sh
24 changes: 2 additions & 22 deletions .github/workflows/scripts/ansible-playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,5 @@
state: started
name: "{{webserver}}"

# Store the intelmq version in a variable
- name: Get intelmq version
command: intelmqctl --version
register: intelmqversion
- name: Set intelmq_version fact
set_fact:
intelmq_version={{ intelmqversion.stdout }}
- name: Set intelmq_major_version fact
set_fact:
intelmq_major_version={{ intelmqversion.stdout[:1] }}
- name: Print version
debug:
msg: IntelMQ Version {{ intelmq_version }} and IntelMQ Major Version {{ intelmq_major_version }}

- name: Run configuration upgrade
command: intelmqctl upgrade-config -u v300_pipeline_file_removal -f
when:
intelmq_major_version == '3'

- name: Run CLI tests
include: "{{ item }}"
loop: "{{ query('fileglob', '/src/intelmq-vagrant/ansible/tasks/cli/*.yml') | sort }}"
- name: Run tasks
include: "tasks.yml"