Skip to content

Commit 48f7d47

Browse files
committed
Install dependencies with dnf
1 parent f01dcc0 commit 48f7d47

6 files changed

Lines changed: 33 additions & 9 deletions

File tree

ansible/group_vars/all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
---
22
runtime_command: docker
33
has_rpm_ostree: false
4+
has_dnf: false
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
---
22
ansible_user: core
3+
has_rpm_ostree: true
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
has_dnf: true
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
has_dnf: true
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
- name: Check package manager is set
2+
ansible.builtin.fail:
3+
msg: No package manager configured
4+
when: not has_rpm_ostree and not has_dnf
5+
6+
- name: Install dependencies
7+
become: true
8+
community.general.rpm_ostree_pkg:
9+
apply_live: true
10+
name:
11+
- make
12+
- python3-packaging
13+
- python3-requests
14+
state: present
15+
when: has_rpm_ostree
16+
17+
- name: Install dependencies
18+
become: true
19+
ansible.builtin.dnf:
20+
name:
21+
- make
22+
- python3-packaging
23+
- python3-requests
24+
state: present
25+
when: has_dnf

ansible/run-tests.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@
66

77
tasks:
88
- name: Install dependencies
9-
become: true
10-
community.general.rpm_ostree_pkg:
11-
apply_live: true
12-
name:
13-
- make
14-
- python3-packaging
15-
- python3-requests
16-
state: present
17-
when: has_rpm_ostree
9+
ansible.builtin.include_role:
10+
name: install-test-dependencies
1811

1912
- name: Login to quay.io
2013
community.docker.docker_login:

0 commit comments

Comments
 (0)