ansible: fix apt deprecation warning about loops

Fix deprecation warnings like the following:
  [DEPRECATION WARNING]: Invoking "apt" only once while using a loop
  via squash_actions is deprecated. Instead of using a loop to supply
  multiple items  and specifying `name: "{{ item }}"`, please use
  `name: ['libjansson-dev', 'libulfius-dev']` and remove the loop.
  This feature will be removed in version 2.11.

Related: OS#5055
Change-Id: I57b9ce690e8167249468954f3e62d14c7a92fcfc
This commit is contained in:
Oliver Smith 2021-03-08 11:16:35 +01:00
parent 8c48d2020a
commit aee8b3f14b
11 changed files with 260 additions and 288 deletions

View File

@ -2,14 +2,13 @@
- name: add https support
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- apt-transport-https
- gnupg
- cron
- ca-certificates
cache_valid_time: 3600
update_cache: yes
- name: add docker gpg key to apt keyring
apt_key:

View File

@ -15,12 +15,11 @@
- name: usrp install apt dependecies
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- libuhd-dev
- uhd-host
cache_valid_time: 3600
update_cache: yes
register: uhd_installed
- name: usrp download firmware
@ -48,8 +47,7 @@
- name: install osmocom utilities
apt:
name: "{{ item }}"
with_items:
name:
- abisip-find
- osmo-bsc-ipaccess-utils
- osmo-bsc-bs11-utils

View File

@ -9,8 +9,7 @@
- name: install osmocom runtime dependencies
apt:
name: "{{ item }}"
with_items:
name:
- build-essential
- git
- automake
@ -41,8 +40,7 @@
# mdbus2 is not available in debian10. TODO: compile it for >9
- name: install mdbus2
apt:
name: "{{ item }}"
with_items:
name:
- mdbus2
when: ansible_distribution == 'Debian' and ansible_distribution_version <= '9'
tags:
@ -51,8 +49,7 @@
- name: install srsLTE build-only dependencies
apt:
name: "{{ item }}"
with_items:
name:
- cmake
- libfftw3-dev
- libmbedtls-dev
@ -68,8 +65,7 @@
- name: install srsLTE runtime extra dependencies (Debian)
apt:
name: "{{ item }}"
with_items:
name:
- soapysdr0.7-module-lms7
when: ansible_distribution == 'Debian'
tags:
@ -77,8 +73,7 @@
- name: install srsLTE runtime extra dependencies (Ubuntu)
apt:
name: "{{ item }}"
with_items:
name:
- soapysdr0.6-module-lms7
when: ansible_distribution == 'Ubuntu'
tags:
@ -101,8 +96,7 @@
- name: install uhub dependencies
apt:
name: "{{ item }}"
with_items:
name:
- libusb-1.0-0-dev
tags:
- modem
@ -172,8 +166,7 @@
- name: install patchelf build dependencies
apt:
name: "{{ item }}"
with_items:
name:
- autoconf
tags:
- patchelf
@ -208,8 +201,7 @@
- name: install gsm tester dependencies (main)
apt:
name: "{{ item }}"
with_items:
name:
- sqlite3
- python3
- python3-setuptools
@ -229,8 +221,7 @@
- name: install gsm tester dependencies (proc)
apt:
name: "{{ item }}"
with_items:
name:
- tcpdump
- patchelf
- libcap2-bin

View File

@ -1,8 +1,7 @@
---
- name: install coverity-required debian packages
apt:
name: "{{ item }}"
with_items:
name:
- curl
- name: copy coverity installer

View File

@ -1,12 +1,11 @@
---
- name: install bzip2 and tar
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- tar
- bzip2
cache_valid_time: 3600
update_cache: yes
- name: copy poky installer
copy:

View File

@ -2,11 +2,7 @@
- name: install jenkins utilities
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
install_recommends: no
with_items:
name:
- htop
- virt-manager
- qemu
@ -15,6 +11,9 @@
- proot
- debootstrap
- fakeroot
cache_valid_time: 3600
update_cache: yes
install_recommends: no
when: install_jenkins_utilities
- name: stop checking release validity for old stable
@ -41,20 +40,18 @@
- name: install java for stretch
apt:
name: "{{ item }}"
name:
- openjdk-8-jre-headless
cache_valid_time: 3600
update_cache: yes
install_recommends: no
with_items:
- openjdk-8-jre-headless
when: ansible_distribution == 'Debian' and ansible_distribution_version == '9'
- name: install java for buster and later
apt:
name: "{{ item }}"
name:
- openjdk-11-jre-headless
cache_valid_time: 3600
update_cache: yes
install_recommends: no
with_items:
- openjdk-11-jre-headless
when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 10

View File

@ -1,10 +1,7 @@
---
- name: install build utilities
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- asciidoc
- autoconf
- autoconf-archive
@ -53,14 +50,12 @@
- sdcc
# by mingw upload job
- rsync
cache_valid_time: 3600
update_cache: yes
- name: install build dependencies and libraries
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
install_recommends: no
with_items:
name:
- dahdi-source
- docbook5-xml
- libboost-dev
@ -98,6 +93,9 @@
- libzmq3-dev
- sqlite3
- libaio-dev
cache_valid_time: 3600
update_cache: yes
install_recommends: no
- name: install liblua for jessie
apt:
@ -110,40 +108,34 @@
- name: install liblua for stretch or later
apt:
name: "{{ item }}"
name:
- liblua5.3-dev
cache_valid_time: 3600
update_cache: yes
install_recommends: no
with_items:
- liblua5.3-dev
when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9
- name: install liblimesuite-dev for stretch or later
apt:
name: "{{ item }}"
name:
- liblimesuite-dev
cache_valid_time: 3600
update_cache: yes
install_recommends: no
with_items:
- liblimesuite-dev
when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9
- name: install osmo-remsim dependencies
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- libjansson-dev
- libulfius-dev
cache_valid_time: 3600
update_cache: yes
when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9
- name: install srsLTE build dependencies
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- cmake
- libfftw3-dev
- libmbedtls-dev
@ -154,14 +146,13 @@
- libuhd-dev
- libczmq-dev
- libsoapysdr-dev
cache_valid_time: 3600
update_cache: yes
when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9
- name: install open5gs build dependencies
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- meson
- ninja-build
- libgcrypt-dev
@ -169,6 +160,8 @@
- libmongoc-dev
- libbson-dev
- libyaml-dev
cache_valid_time: 3600
update_cache: yes
when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 10
- name: download osmo-python-tests for py2

View File

@ -14,10 +14,7 @@
- name: install distribution packages
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- iceweasel
- vim
- evince
@ -46,3 +43,5 @@
- xfce4
- network-manager
- modemmanager
cache_valid_time: 3600
update_cache: yes

View File

@ -5,16 +5,15 @@
tasks:
- name: install common utilities
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- vim
- tmux
- screen
- ca-certificates
- wget
- curl
cache_valid_time: 3600
update_cache: yes
roles:
- name: gsm-tester
tags:

View File

@ -7,14 +7,13 @@
tasks:
- name: install common utilities
apt:
name: "{{ item }}"
cache_valid_time: 3600
update_cache: yes
with_items:
name:
- vim
- tmux
- screen
- ca-certificates
cache_valid_time: 3600
update_cache: yes
roles:
- name: docker
jenkins_user: osmocom-build

View File

@ -10,9 +10,7 @@
- name: install common utilities
apt:
name: "{{ item }}"
install_recommends: no
with_items:
name:
- vim
- ca-certificates
- python3-minimal
@ -21,6 +19,7 @@
- python3-serial
- python3-pyscard
- virtualenv
install_recommends: no
roles:
- name: osmocom-jenkins-slave