Change in osmo-ci[master]: osmocom-jenkins-slave: Re-order

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/21396 )


Change subject: osmocom-jenkins-slave: Re-order
......................................................................

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
---
M ansible/roles/osmocom-jenkins-slave/tasks/main.yml
1 file changed, 4 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/96/21396/1

diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml
index 0ed682a..b7fa2d3 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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21396
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I66f1d5f7479a6d028abdac0cc6f4000faa78b135
Gerrit-Change-Number: 21396
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201128/ebdfd880/attachment.htm>