osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34161 ) Change subject: ansible: osmocom_build_deps: remove ...................................................................... ansible: osmocom_build_deps: remove The builds for almost all jenkins jobs are done in docker now, we definitely don't need to install all of these dependencies on all jenkins nodes anymore. Remove the file for now, so it doesn't look like they still get used and so we don't need to keep it up-to-date (e.g. inkscape was just replaced with rsvg-convert). When we deploy a new jenkins node and notice that we still do need a few of these dependencies, we can bring them back later. Change-Id: I7c87bd516d1bcdbcc21f65909dabbd3ccc38eede --- M ansible/roles/osmocom-jenkins-slave/README.md M ansible/roles/osmocom-jenkins-slave/defaults/main.yml M ansible/roles/osmocom-jenkins-slave/tasks/main.yml D ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M ansible/setup-simtest.yml 5 files changed, 20 insertions(+), 197 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ansible/roles/osmocom-jenkins-slave/README.md b/ansible/roles/osmocom-jenkins-slave/README.md index 50aed16..81f68b3 100644 --- a/ansible/roles/osmocom-jenkins-slave/README.md +++ b/ansible/roles/osmocom-jenkins-slave/README.md @@ -3,7 +3,6 @@ Support the following variables: * `install_jenkins_utilities`: (true) install usefull utilities including qemu/debootstrap/fakeroot -* `install_osmocom_build_deps`: (true) install all osmocom runtime and build time dependencies * `generic_slave`: (true) contains tasks used by the most osmocom jenkins slaves * `osmocom_jenkins_slave_fstrim`: (false) calls fstrim periodical * `ttcn3_slave`: (true) install titan ttcn3 compiler and prepares the docker-playground diff --git a/ansible/roles/osmocom-jenkins-slave/defaults/main.yml b/ansible/roles/osmocom-jenkins-slave/defaults/main.yml index 4e1f179..a4ce8ac 100644 --- a/ansible/roles/osmocom-jenkins-slave/defaults/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/defaults/main.yml @@ -6,9 +6,6 @@ # install usefull utilities including qemu/debootstrap/fakeroot install_jenkins_utilities: true -# install all osmocom runtime and build time dependencies -install_osmocom_build_deps: true - # E.g. a generic_slave requires different tasks as a # special slave including the gsm-tester generic_slave: true diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml index e5ebbe1..1868d97 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml @@ -38,10 +38,6 @@ include_tasks: ttcn3-slave.yml when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 and not (ansible_architecture == "armv7l" or ansible_architecture == "arm64") -- name: include osmocom_build_deps.yml - include_tasks: osmocom_build_deps.yml - when: install_osmocom_build_deps - - name: include generic slave include_tasks: generic-slave.yml when: generic_slave diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml deleted file mode 100644 index 8faab77..0000000 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ /dev/null @@ -1,188 +0,0 @@ ---- -- name: install build utilities - apt: - name: - - asciidoc - - autoconf - - autoconf-archive - - automake - - bc - - bison - - coccinelle - - cppcheck - - debhelper - - devscripts - - dh-autoreconf - - doxygen - - flex - - g++ - - gawk - - gcc - - gcc-arm-none-eabi - - git - - git-buildpackage - - graphviz - - libcsv-dev - - libtool - - libboost-all-dev - - make - - mscgen - - osc - - pkgconf - - python-setuptools - - python3 - - python3-setuptools - - stow - - texinfo - # by gsm-manuals - - python3-nwdiag - - inkscape - # by gapk - - libasound-dev - - libopencore-amrnb-dev - # by LimeSuite - - cmake - - patchelf - # by libusrp - - sdcc - # by mingw upload job - - rsync - cache_valid_time: 3600 - update_cache: yes - -- name: install build dependencies and libraries - apt: - name: - - dahdi-source - - docbook5-xml - - libboost-dev - - libc-ares-dev - - libdbd-sqlite3 - - libdbi-dev - - libffi-dev - - libffi-dev - - libfftw3-dev - - libgmp-dev - - libgnutls28-dev - - libgps-dev - - libgsm1-dev - - libnftables-dev - - libnl-3-dev - - libnl-route-3-dev - - libmnl-dev - # by osmo-sysmon - - liboping-dev - - libncurses5-dev - - libortp-dev - - libpcap-dev - - libpcsclite-dev - - libreadline-dev - - libsctp-dev - - libsigsegv-dev - - libsnmp-dev - - libsofia-sip-ua-glib-dev - - libsqlite3-dev - - libssl-dev - - libsystemd-dev - - libtalloc-dev - - libuhd-dev - - libusb-1.0-0-dev - - libusb-dev - - libzmq3-dev - - sqlite3 - - libaio-dev - cache_valid_time: 3600 - update_cache: yes - install_recommends: no - -- name: install liblua for jessie - apt: - name: liblua5.3-dev - cache_valid_time: 3600 - update_cache: yes - install_recommends: no - default_release: jessie-backports - when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' - -- name: install liblua for stretch or later - apt: - name: - - liblua5.3-dev - cache_valid_time: 3600 - update_cache: yes - install_recommends: no - when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 - -- name: install liblimesuite-dev for stretch or later - apt: - name: - - liblimesuite-dev - cache_valid_time: 3600 - update_cache: yes - install_recommends: no - when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 - -- name: install osmo-remsim dependencies - apt: - 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: - - cmake - - libfftw3-dev - - libmbedtls-dev - - libboost-program-options-dev - - libconfig++-dev - - libsctp-dev - - libpcsclite-dev - - 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: - - meson - - ninja-build - - libgcrypt-dev - - libidn11-dev - - libmongoc-dev - - libbson-dev - - libyaml-dev - - libnghttp2-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 - git: - repo: "https://gerrit.osmocom.org/python/osmo-python-tests" - dest: "/home/{{ jenkins_user }}/osmo-python-tests2" - version: "fb4b813d4df62b7b2445bdced961eb1847267eed" - -- name: install osmo-python-tests for py2 - shell: - cmd: "python2 setup.py clean build install && date > installed" - chdir: "/home/{{ jenkins_user }}/osmo-python-tests2" - creates: "/home/{{ jenkins_user }}/osmo-python-tests2/installed" - -- name: download osmo-python-tests for py3 - git: - repo: "https://gerrit.osmocom.org/python/osmo-python-tests" - dest: "/home/{{ jenkins_user }}/osmo-python-tests3" - version: "be7fcf5f28a5d0f9ad35510f09b5979268d76598" - -- name: install osmo-python-tests for py3 - shell: - cmd: "python3 setup.py clean build install && date > installed" - chdir: "/home/{{ jenkins_user }}/osmo-python-tests3" - creates: "/home/{{ jenkins_user }}/osmo-python-tests3/installed" diff --git a/ansible/setup-simtest.yml b/ansible/setup-simtest.yml index 7b6913c..eb37186 100644 --- a/ansible/setup-simtest.yml +++ b/ansible/setup-simtest.yml @@ -36,7 +36,6 @@ - name: osmocom-jenkins-slave generic_slave: false install_jenkins_utilities: false - install_osmocom_build_deps: false ttcn3_slave: false tags: - jenkins-slave -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7c87bd516d1bcdbcc21f65909dabbd3ccc38eede Gerrit-Change-Number: 34161 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged