From 4ddf61697a25a9f9d44101440d49b0aa6c023d90 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 26 Feb 2020 11:06:56 +0100 Subject: [PATCH] ansible: fix java for debian 10 Change-Id: I8b81edf420534726cd987f3f90efe79ca921f41a --- .../roles/osmocom-jenkins-slave/tasks/debian.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index bac2c163..a8a36a7f 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -39,7 +39,7 @@ default_release: jessie-backports when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' -- name: install java for stretch or later +- name: install java for stretch apt: name: "{{ item }}" cache_valid_time: 3600 @@ -47,4 +47,14 @@ install_recommends: no with_items: - openjdk-8-jre-headless - when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 + when: ansible_distribution == 'Debian' and ansible_distribution_version == '9' + +- name: install java for buster and later + apt: + name: "{{ item }}" + cache_valid_time: 3600 + update_cache: yes + install_recommends: no + with_items: + - openjdk-11-jre-headless + when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 10