osmocom
/
osmo-ci
mirror of https://gerrit.osmocom.org/osmo-ci
10
0
Fork 1
Code Releases Activity

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
This commit is contained in:
Harald Welte 2020-02-26 10:44:14 +01:00 committed by laforge
parent 3935743127
commit a17fa43f1a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/osmocom-jenkins-slave/tasks/debian.yml
View File

@ -47,4 +47,4 @@
install_recommends: no install_recommends: no
with_items: with_items:
- openjdk-8-jre-headless - openjdk-8-jre-headless
when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9' when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9

2
ansible/roles/osmocom-jenkins-slave/tasks/main.yml
View File

@ -31,7 +31,7 @@
- name: install ttcn3 dependencies - name: install ttcn3 dependencies
include_tasks: ttcn3-slave.yml 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 - name: copy .gitconfig
copy: copy:

6
ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml
View File

@ -112,7 +112,7 @@
install_recommends: no install_recommends: no
with_items: with_items:
- liblua5.3-dev - 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 - name: install liblimesuite-dev for stretch or later
apt: apt:
@ -122,7 +122,7 @@
install_recommends: no install_recommends: no
with_items: with_items:
- liblimesuite-dev - 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 - name: install osmo-remsim dependencies
apt: apt:
@ -132,7 +132,7 @@
with_items: with_items:
- libjansson-dev - libjansson-dev
- libulfius-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 - name: install srsLTE build dependencies
apt: apt: