Change in osmo-ci[master]: Make "ansible_distribution_version >= 9" work

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17265 )

Change subject: Make "ansible_distribution_version >= 9" work
......................................................................

Make "ansible_distribution_version >= 9" work

The distribution version must not be quoted in this case (string) but
given as an integer.  Otherwise it will match only on 9, but not on 10.

Change-Id: I6ff3d16d2eac891e6663e8860eec2058478f4b79
---
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(-)

Approvals:
  laforge: Looks good to me, approved; Verified



diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
index 38228ec..bac2c16 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
@@ -47,4 +47,4 @@
     install_recommends: no
   with_items:
     - openjdk-8-jre-headless
-  when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9'
+  when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
index ca66bc4..0ed682a 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
@@ -31,7 +31,7 @@
 
 - name: install ttcn3 dependencies
   include_tasks: ttcn3-slave.yml
-  when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= '9' and not (ansible_architecture == "armv7l" or ansible_architecture == "arm64")
+  when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 and not (ansible_architecture == "armv7l" or ansible_architecture == "arm64")
 
 - 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 bc90aae..0b2fe63 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
@@ -112,7 +112,7 @@
     install_recommends: no
   with_items:
     - liblua5.3-dev
-  when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9'
+  when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9
 
 - name: install liblimesuite-dev for stretch or later
   apt:
@@ -122,7 +122,7 @@
     install_recommends: no
   with_items:
     - liblimesuite-dev
-  when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9'
+  when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9
 
 - name: install osmo-remsim dependencies
   apt:
@@ -132,7 +132,7 @@
   with_items:
     - libjansson-dev
     - libulfius-dev
-  when: ansible_distribution == 'Debian' and ansible_distribution_version == '9'
+  when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9
 
 - name: install srsLTE build dependencies
   apt:

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6ff3d16d2eac891e6663e8860eec2058478f4b79
Gerrit-Change-Number: 17265
Gerrit-PatchSet: 3
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200226/8a0427a3/attachment.htm>