summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-02-26 10:44:14 +0100
committerlaforge <laforge@osmocom.org>2020-02-26 13:47:20 +0000
commita17fa43f1aba0ef06d9bc7657b2a058135f807b6 (patch)
tree0ec064e876442c8fef89ebc85547f22f4d68565e
parent3935743127633815b068cd57469775722c3710e3 (diff)
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
-rw-r--r--ansible/roles/osmocom-jenkins-slave/tasks/debian.yml2
-rw-r--r--ansible/roles/osmocom-jenkins-slave/tasks/main.yml2
-rw-r--r--ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml6
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 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: