<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11573">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ansible: Future proof for debian releases after debian9.0<br><br>buster has a liblua5.3-dev, openjdk-8-jre-headless and the ttcn3<br>packages should work as well.<br><br>Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f<br>---<br>M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml<br>M ansible/roles/osmocom-jenkins-slave/tasks/main.yml<br>M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml<br>3 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/73/11573/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml</span><br><span>index ad9f5c2..87a616c 100644</span><br><span>--- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml</span><br><span>+++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml</span><br><span>@@ -32,7 +32,7 @@</span><br><span>     default_release: jessie-backports</span><br><span>   when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-- name: install java for stretch</span><br><span style="color: hsl(120, 100%, 40%);">+- name: install java for stretch or later</span><br><span>   apt:</span><br><span>     name: "{{ item }}"</span><br><span>     cache_valid_time: 3600</span><br><span>@@ -40,4 +40,4 @@</span><br><span>     install_recommends: no</span><br><span>   with_items:</span><br><span>     - openjdk-8-jre-headless</span><br><span style="color: hsl(0, 100%, 40%);">-  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9</span><br><span>diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml</span><br><span>index 072792d..98cae55 100644</span><br><span>--- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml</span><br><span>+++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml</span><br><span>@@ -27,7 +27,7 @@</span><br><span> </span><br><span> - name: install ttcn3 dependencies</span><br><span>   include_tasks: ttcn3-slave.yml</span><br><span style="color: hsl(0, 100%, 40%);">-  when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= 9</span><br><span> </span><br><span> - name: copy .gitconfig</span><br><span>   copy:</span><br><span>diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml</span><br><span>index 73623e3..4ccdf9f 100644</span><br><span>--- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml</span><br><span>+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml</span><br><span>@@ -97,7 +97,7 @@</span><br><span>     default_release: jessie-backports</span><br><span>   when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-- name: install liblua for stretch</span><br><span style="color: hsl(120, 100%, 40%);">+- name: install liblua for stretch or later</span><br><span>   apt:</span><br><span>     name: "{{ item }}"</span><br><span>     cache_valid_time: 3600</span><br><span>@@ -105,4 +105,4 @@</span><br><span>     install_recommends: no</span><br><span>   with_items:</span><br><span>     - liblua5.3-dev</span><br><span style="color: hsl(0, 100%, 40%);">-  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11573">change 11573</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11573"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f </div>
<div style="display:none"> Gerrit-Change-Number: 11573 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>