From 8df41af01099bd58d09f487e13d54624b05e82e4 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 28 Nov 2020 22:02:52 +0100 Subject: [PATCH] osmocom-jenkins-slave: Re-order Install TTCN3 before installing build-deps, as build-deps requires libulfius, which is only provided by network:osmocom:latest feed, which in turn is only activated as part of the TTCN3 / TITAN installation. Change-Id: I66f1d5f7479a6d028abdac0cc6f4000faa78b135 --- ansible/roles/osmocom-jenkins-slave/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml index 0ed682a5..b7fa2d3c 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml @@ -17,6 +17,10 @@ user: "{{ jenkins_user }}" key: "{{ lookup('file', 'jenkins.osmocom.org.pub') }}" +- name: install ttcn3 dependencies + 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 @@ -29,10 +33,6 @@ include_tasks: osmo-ci.yml when: generic_slave -- name: install ttcn3 dependencies - 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: copy .gitconfig copy: src: gitconfig