Change in osmo-ci[master]: ansible: fix java for debian 10

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17268 )


Change subject: ansible: fix java for debian 10
......................................................................

ansible: fix java for debian 10

Change-Id: I8b81edf420534726cd987f3f90efe79ca921f41a
---
M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
1 file changed, 12 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/68/17268/1

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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17268
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I8b81edf420534726cd987f3f90efe79ca921f41a
Gerrit-Change-Number: 17268
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200226/e31e84cc/attachment.htm>