diff --git a/inventory/group_vars/jenkins-slave b/inventory/group_vars/jenkins-slave index ed525a453e..b6be1694e8 100644 --- a/inventory/group_vars/jenkins-slave +++ b/inventory/group_vars/jenkins-slave @@ -245,17 +245,12 @@ el7_only: - python-pygit2 # Required by pagure - python-pygments-markdown-lexer # Required by fedora-hubs (ticket #5425) -# Packages only available in f23+ -f23_only: -- mod_auth_openidc -- python2-solv # For modulemd-resolver. (ticket #5349) -- python3-solv # For modulemd-resolver. (ticket #5349) -- python-requests-kerberos -- python-jinja2 - # Packages only available/needed in f24+ f24_only: - python2-systemd - python2-requests-kerberos - python2-jinja2 - devscripts-minimal # Required by FedoraReview + +f25_only: +- python3-tox diff --git a/roles/jenkins/slave/tasks/main.yml b/roles/jenkins/slave/tasks/main.yml index 5e7e7867b9..04599b2ac3 100644 --- a/roles/jenkins/slave/tasks/main.yml +++ b/roles/jenkins/slave/tasks/main.yml @@ -43,10 +43,10 @@ - jenkins/slave - packages -- name: install f23 specific slave packages +- name: install f25 specific slave packages dnf: name={{ item }} state=installed - with_items: "{{ f23_only }}" - when: ansible_distribution_major_version|int == 23 + with_items: "{{ f25_only }}" + when: ansible_distribution_major_version|int == 25 tags: - jenkins - jenkins/slave