diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2018-11-02 12:56:50 +0000 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2018-11-02 13:03:29 +0000 |
| commit | bcd7207c402bb0710b60baf6882211ea88f73bae (patch) | |
| tree | 8691c43ff09fa7dc23236521698ba85d623e72a0 /ansible/roles/osmocom-jenkins-slave | |
| parent | 6af154e9425c7bce52993ab665d56caa52435fc7 (diff) | |
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
Diffstat (limited to 'ansible/roles/osmocom-jenkins-slave')
3 files changed, 5 insertions, 5 deletions
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 |