Holger Freyther has uploaded this change for review. (
https://gerrit.osmocom.org/11573
Change subject: ansible: Future proof for debian releases after debian9.0
......................................................................
ansible: Future proof for debian releases after debian9.0
buster has a liblua5.3-dev, openjdk-8-jre-headless and the ttcn3
packages should work as well.
Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f
---
M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
M ansible/roles/osmocom-jenkins-slave/tasks/main.yml
M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/73/11573/1
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
index ad9f5c2..87a616c 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
@@ -32,7 +32,7 @@
default_release: jessie-backports
when: ansible_distribution == 'Debian' and ansible_distribution_release ==
'jessie'
-- name: install java for stretch
+- name: install java for stretch or later
apt:
name: "{{ item }}"
cache_valid_time: 3600
@@ -40,4 +40,4 @@
install_recommends: no
with_items:
- openjdk-8-jre-headless
- when: ansible_distribution == 'Debian' and ansible_distribution_release ==
'stretch'
+ when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
index 072792d..98cae55 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
@@ -27,7 +27,7 @@
- name: install ttcn3 dependencies
include_tasks: ttcn3-slave.yml
- when: ttcn3_slave and ansible_distribution == 'Debian' and
ansible_distribution_release == 'stretch'
+ when: ttcn3_slave and ansible_distribution == 'Debian' and
ansible_distribution_version >= 9
- name: copy .gitconfig
copy:
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
index 73623e3..4ccdf9f 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
@@ -97,7 +97,7 @@
default_release: jessie-backports
when: ansible_distribution == 'Debian' and ansible_distribution_release ==
'jessie'
-- name: install liblua for stretch
+- name: install liblua for stretch or later
apt:
name: "{{ item }}"
cache_valid_time: 3600
@@ -105,4 +105,4 @@
install_recommends: no
with_items:
- liblua5.3-dev
- when: ansible_distribution == 'Debian' and ansible_distribution_release ==
'stretch'
+ when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9
--
To view, visit https://gerrit.osmocom.org/11573
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f
Gerrit-Change-Number: 11573
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther <[email protected]>
