<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10014">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
lynxis lazus: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ansible: osmocom-jenkins-slave: move installing build + runtime deps into own file<br><br>For small nodes (e.g. simtester) the full blown packages are not required nor supported.<br>In this case only the jenkins user and the ssh keys will be setted up.<br><br>Change-Id: I469a8012b124516bfd9c4d4dd3a3fe0e1ff80bb6<br>---<br>M ansible/roles/osmocom-jenkins-slave/README.md<br>M ansible/roles/osmocom-jenkins-slave/defaults/main.yml<br>M ansible/roles/osmocom-jenkins-slave/tasks/main.yml<br>A ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml<br>4 files changed, 93 insertions(+), 85 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ansible/roles/osmocom-jenkins-slave/README.md b/ansible/roles/osmocom-jenkins-slave/README.md</span><br><span>index 51bf6a1..de02b43 100644</span><br><span>--- a/ansible/roles/osmocom-jenkins-slave/README.md</span><br><span>+++ b/ansible/roles/osmocom-jenkins-slave/README.md</span><br><span>@@ -2,6 +2,7 @@</span><br><span> </span><br><span> Support the following variables:</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+* `install_osmocom_build_deps`: (true) install all osmocom runtime and build time dependencies</span><br><span> * `generic_slave`: (true) contains tasks used by the most osmocom jenkins slaves</span><br><span> * `osmocom_jenkins_slave_fstrim`: (false) calls fstrim periodical</span><br><span> * `ttcn3_slave`: (true) install titan ttcn3 compiler and prepares the docker-playground</span><br><span>diff --git a/ansible/roles/osmocom-jenkins-slave/defaults/main.yml b/ansible/roles/osmocom-jenkins-slave/defaults/main.yml</span><br><span>index e32b5a0..bdc13b4 100644</span><br><span>--- a/ansible/roles/osmocom-jenkins-slave/defaults/main.yml</span><br><span>+++ b/ansible/roles/osmocom-jenkins-slave/defaults/main.yml</span><br><span>@@ -3,6 +3,9 @@</span><br><span> # OS user</span><br><span> jenkins_user: jenkins</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# install all osmocom runtime and build time dependencies</span><br><span style="color: hsl(120, 100%, 40%);">+install_osmocom_build_deps: true</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # E.g. a generic_slave requires different tasks as a</span><br><span> # special slave including the gsm-tester</span><br><span> generic_slave: true</span><br><span>diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml</span><br><span>index cca3704..072792d 100644</span><br><span>--- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml</span><br><span>+++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml</span><br><span>@@ -4,91 +4,6 @@</span><br><span> include_tasks: debian.yml</span><br><span> when: ansible_distribution == 'Debian'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-- name: install build utilities</span><br><span style="color: hsl(0, 100%, 40%);">- apt:</span><br><span style="color: hsl(0, 100%, 40%);">- name: "{{ item }}"</span><br><span style="color: hsl(0, 100%, 40%);">- cache_valid_time: 3600</span><br><span style="color: hsl(0, 100%, 40%);">- update_cache: yes</span><br><span style="color: hsl(0, 100%, 40%);">- with_items:</span><br><span style="color: hsl(0, 100%, 40%);">- - asciidoc</span><br><span style="color: hsl(0, 100%, 40%);">- - autoconf</span><br><span style="color: hsl(0, 100%, 40%);">- - autoconf-archive</span><br><span style="color: hsl(0, 100%, 40%);">- - automake</span><br><span style="color: hsl(0, 100%, 40%);">- - bc</span><br><span style="color: hsl(0, 100%, 40%);">- - bison</span><br><span style="color: hsl(0, 100%, 40%);">- - coccinelle</span><br><span style="color: hsl(0, 100%, 40%);">- - cppcheck</span><br><span style="color: hsl(0, 100%, 40%);">- - debhelper</span><br><span style="color: hsl(0, 100%, 40%);">- - devscripts</span><br><span style="color: hsl(0, 100%, 40%);">- - dh-autoreconf</span><br><span style="color: hsl(0, 100%, 40%);">- - dh-systemd</span><br><span style="color: hsl(0, 100%, 40%);">- - doxygen</span><br><span style="color: hsl(0, 100%, 40%);">- - flex</span><br><span style="color: hsl(0, 100%, 40%);">- - g++</span><br><span style="color: hsl(0, 100%, 40%);">- - gawk</span><br><span style="color: hsl(0, 100%, 40%);">- - gcc</span><br><span style="color: hsl(0, 100%, 40%);">- - gcc-arm-none-eabi</span><br><span style="color: hsl(0, 100%, 40%);">- - git</span><br><span style="color: hsl(0, 100%, 40%);">- - git-buildpackage</span><br><span style="color: hsl(0, 100%, 40%);">- - graphviz</span><br><span style="color: hsl(0, 100%, 40%);">- - libtool</span><br><span style="color: hsl(0, 100%, 40%);">- - libboost-all-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - make</span><br><span style="color: hsl(0, 100%, 40%);">- - mscgen</span><br><span style="color: hsl(0, 100%, 40%);">- - osc</span><br><span style="color: hsl(0, 100%, 40%);">- - pkgconf</span><br><span style="color: hsl(0, 100%, 40%);">- - python-minimal</span><br><span style="color: hsl(0, 100%, 40%);">- - python-setuptools</span><br><span style="color: hsl(0, 100%, 40%);">- - python3</span><br><span style="color: hsl(0, 100%, 40%);">- - python3-setuptools</span><br><span style="color: hsl(0, 100%, 40%);">- - stow</span><br><span style="color: hsl(0, 100%, 40%);">- - texinfo</span><br><span style="color: hsl(0, 100%, 40%);">- # by gsm-manuals</span><br><span style="color: hsl(0, 100%, 40%);">- - python-nwdiag</span><br><span style="color: hsl(0, 100%, 40%);">- - python-pychart</span><br><span style="color: hsl(0, 100%, 40%);">- # by gapk</span><br><span style="color: hsl(0, 100%, 40%);">- - libasound-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libopencore-amrnb-dev</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-- name: install build dependencies and libraries</span><br><span style="color: hsl(0, 100%, 40%);">- apt:</span><br><span style="color: hsl(0, 100%, 40%);">- name: "{{ item }}"</span><br><span style="color: hsl(0, 100%, 40%);">- cache_valid_time: 3600</span><br><span style="color: hsl(0, 100%, 40%);">- update_cache: yes</span><br><span style="color: hsl(0, 100%, 40%);">- install_recommends: no</span><br><span style="color: hsl(0, 100%, 40%);">- with_items:</span><br><span style="color: hsl(0, 100%, 40%);">- - docbook5-xml</span><br><span style="color: hsl(0, 100%, 40%);">- - libboost-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libc-ares-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libdbd-sqlite3</span><br><span style="color: hsl(0, 100%, 40%);">- - libdbi-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libffi-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libffi-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libfftw3-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libgmp-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libgnutls28-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libgps-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libgsm1-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libmnl-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libncurses5-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libortp-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libpcap-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libpcsclite-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libreadline-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libsctp-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libsigsegv-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libsnmp-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libsofia-sip-ua-glib-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libsqlite3-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libssl-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libsystemd-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libtalloc-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libuhd-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libusb-1.0-0-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libusb-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - libzmq3-dev</span><br><span style="color: hsl(0, 100%, 40%);">- - sqlite3</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> - name: add user jenkins</span><br><span> user:</span><br><span> name: "{{ jenkins_user }}"</span><br><span>@@ -102,6 +17,10 @@</span><br><span> user: "{{ jenkins_user }}"</span><br><span> key: "{{ lookup('file', 'jenkins.osmocom.org.pub') }}"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+- name: include osmocom_build_deps.yml</span><br><span style="color: hsl(120, 100%, 40%);">+ include_tasks: osmocom_build_deps.yml</span><br><span style="color: hsl(120, 100%, 40%);">+ when: install_osmocom_build_deps</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> - name: include generic slave</span><br><span> include_tasks: generic-slave.yml</span><br><span> when: generic_slave</span><br><span>diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml</span><br><span>new file mode 100644</span><br><span>index 0000000..733866c</span><br><span>--- /dev/null</span><br><span>+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml</span><br><span>@@ -0,0 +1,85 @@</span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+- name: install build utilities</span><br><span style="color: hsl(120, 100%, 40%);">+ apt:</span><br><span style="color: hsl(120, 100%, 40%);">+ name: "{{ item }}"</span><br><span style="color: hsl(120, 100%, 40%);">+ cache_valid_time: 3600</span><br><span style="color: hsl(120, 100%, 40%);">+ update_cache: yes</span><br><span style="color: hsl(120, 100%, 40%);">+ with_items:</span><br><span style="color: hsl(120, 100%, 40%);">+ - asciidoc</span><br><span style="color: hsl(120, 100%, 40%);">+ - autoconf</span><br><span style="color: hsl(120, 100%, 40%);">+ - autoconf-archive</span><br><span style="color: hsl(120, 100%, 40%);">+ - automake</span><br><span style="color: hsl(120, 100%, 40%);">+ - bc</span><br><span style="color: hsl(120, 100%, 40%);">+ - bison</span><br><span style="color: hsl(120, 100%, 40%);">+ - coccinelle</span><br><span style="color: hsl(120, 100%, 40%);">+ - cppcheck</span><br><span style="color: hsl(120, 100%, 40%);">+ - debhelper</span><br><span style="color: hsl(120, 100%, 40%);">+ - devscripts</span><br><span style="color: hsl(120, 100%, 40%);">+ - dh-autoreconf</span><br><span style="color: hsl(120, 100%, 40%);">+ - dh-systemd</span><br><span style="color: hsl(120, 100%, 40%);">+ - doxygen</span><br><span style="color: hsl(120, 100%, 40%);">+ - flex</span><br><span style="color: hsl(120, 100%, 40%);">+ - g++</span><br><span style="color: hsl(120, 100%, 40%);">+ - gawk</span><br><span style="color: hsl(120, 100%, 40%);">+ - gcc</span><br><span style="color: hsl(120, 100%, 40%);">+ - gcc-arm-none-eabi</span><br><span style="color: hsl(120, 100%, 40%);">+ - git</span><br><span style="color: hsl(120, 100%, 40%);">+ - git-buildpackage</span><br><span style="color: hsl(120, 100%, 40%);">+ - graphviz</span><br><span style="color: hsl(120, 100%, 40%);">+ - libtool</span><br><span style="color: hsl(120, 100%, 40%);">+ - libboost-all-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - make</span><br><span style="color: hsl(120, 100%, 40%);">+ - mscgen</span><br><span style="color: hsl(120, 100%, 40%);">+ - osc</span><br><span style="color: hsl(120, 100%, 40%);">+ - pkgconf</span><br><span style="color: hsl(120, 100%, 40%);">+ - python-minimal</span><br><span style="color: hsl(120, 100%, 40%);">+ - python-setuptools</span><br><span style="color: hsl(120, 100%, 40%);">+ - python3</span><br><span style="color: hsl(120, 100%, 40%);">+ - python3-setuptools</span><br><span style="color: hsl(120, 100%, 40%);">+ - stow</span><br><span style="color: hsl(120, 100%, 40%);">+ - texinfo</span><br><span style="color: hsl(120, 100%, 40%);">+ # by gsm-manuals</span><br><span style="color: hsl(120, 100%, 40%);">+ - python-nwdiag</span><br><span style="color: hsl(120, 100%, 40%);">+ - python-pychart</span><br><span style="color: hsl(120, 100%, 40%);">+ # by gapk</span><br><span style="color: hsl(120, 100%, 40%);">+ - libasound-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libopencore-amrnb-dev</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+- name: install build dependencies and libraries</span><br><span style="color: hsl(120, 100%, 40%);">+ apt:</span><br><span style="color: hsl(120, 100%, 40%);">+ name: "{{ item }}"</span><br><span style="color: hsl(120, 100%, 40%);">+ cache_valid_time: 3600</span><br><span style="color: hsl(120, 100%, 40%);">+ update_cache: yes</span><br><span style="color: hsl(120, 100%, 40%);">+ install_recommends: no</span><br><span style="color: hsl(120, 100%, 40%);">+ with_items:</span><br><span style="color: hsl(120, 100%, 40%);">+ - docbook5-xml</span><br><span style="color: hsl(120, 100%, 40%);">+ - libboost-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libc-ares-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libdbd-sqlite3</span><br><span style="color: hsl(120, 100%, 40%);">+ - libdbi-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libffi-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libffi-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libfftw3-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libgmp-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libgnutls28-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libgps-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libgsm1-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libmnl-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libncurses5-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libortp-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libpcap-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libpcsclite-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libreadline-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libsctp-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libsigsegv-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libsnmp-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libsofia-sip-ua-glib-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libsqlite3-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libssl-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libsystemd-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libtalloc-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libuhd-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libusb-1.0-0-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libusb-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - libzmq3-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ - sqlite3</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10014">change 10014</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10014"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I469a8012b124516bfd9c4d4dd3a3fe0e1ff80bb6 </div>
<div style="display:none"> Gerrit-Change-Number: 10014 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>