<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/17265">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Make "ansible_distribution_version >= 9" work<br><br>The distribution version must not be quoted in this case (string) but<br>given as an integer.  Otherwise it will match only on 9, but not on 10.<br><br>Change-Id: I6ff3d16d2eac891e6663e8860eec2058478f4b79<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;"><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 38228ec..bac2c16 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>@@ -47,4 +47,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_version >= '9'</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 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 ca66bc4..0ed682a 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>@@ -31,7 +31,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_version >= '9' and not (ansible_architecture == "armv7l" or ansible_architecture == "arm64")</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 and not (ansible_architecture == "armv7l" or ansible_architecture == "arm64")</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 bc90aae..0b2fe63 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>@@ -112,7 +112,7 @@</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_version >= '9'</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9</span><br><span> </span><br><span> - name: install liblimesuite-dev for stretch or later</span><br><span>   apt:</span><br><span>@@ -122,7 +122,7 @@</span><br><span>     install_recommends: no</span><br><span>   with_items:</span><br><span>     - liblimesuite-dev</span><br><span style="color: hsl(0, 100%, 40%);">-  when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9'</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9</span><br><span> </span><br><span> - name: install osmo-remsim dependencies</span><br><span>   apt:</span><br><span>@@ -132,7 +132,7 @@</span><br><span>   with_items:</span><br><span>     - libjansson-dev</span><br><span>     - libulfius-dev</span><br><span style="color: hsl(0, 100%, 40%);">-  when: ansible_distribution == 'Debian' and ansible_distribution_version == '9'</span><br><span style="color: hsl(120, 100%, 40%);">+  when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9</span><br><span> </span><br><span> - name: install srsLTE build dependencies</span><br><span>   apt:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/17265">change 17265</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/c/osmo-ci/+/17265"/><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-Change-Id: I6ff3d16d2eac891e6663e8860eec2058478f4b79 </div>
<div style="display:none"> Gerrit-Change-Number: 17265 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>