summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-02-26 11:06:56 +0100
committerlaforge <laforge@osmocom.org>2020-02-26 13:47:20 +0000
commit4ddf61697a25a9f9d44101440d49b0aa6c023d90 (patch)
treee3ef65e8abc5c973c5319534723a71859f6506be
parent32f08347f7ed7588e3670409afedbd33b1846987 (diff)
ansible: fix java for debian 10
-rw-r--r--ansible/roles/osmocom-jenkins-slave/tasks/debian.yml14
1 files 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 bac2c16..a8a36a7 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