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 - name: add https support
apt: apt:
name: "{{ item }}" name:
cache_valid_time: 3600
update_cache: yes
with_items:
- apt-transport-https - apt-transport-https
- gnupg - gnupg
- cron - cron
- ca-certificates - ca-certificates
cache_valid_time: 3600
update_cache: yes
- name: add docker gpg key to apt keyring - name: add docker gpg key to apt keyring
apt_key: apt_key:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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