[MERGED] osmo-ci[master]: jobs: gerrit-osmo-ttcn3-hacks: Make deps before cleaning

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: jobs: gerrit-osmo-ttcn3-hacks: Make deps before cleaning
......................................................................


jobs: gerrit-osmo-ttcn3-hacks: Make deps before cleaning

make clean has subdir/Makefile as dependency. As a result,
subdir/gen_links.sh and subdir/makefile-regen.sh are called, and
ttcn3_makefilegen in there fails because the dep symlinks are done
against missing files (because git repos in deps have not been checked
out).

Additionally, since 61c11e9234b3f9e087aba94380892ab66abc1191 make
deps-update is equivalent to make deps since the dependency tracking
system was improved, so we can remove it as it's not needed anymore.

Change-Id: I07fee78bba5b07c7f3f4359869e00ef2583e0769
---
M jobs/gerrit-verifications.yml
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 640bde7..7613802 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -189,7 +189,8 @@
           slave_axis: !!python/tuple [ttcn3]
           cmd: >
            # keep first line with less indent to preserve newlines
-            make clean; make deps-update && make compile
+            set -e
+            make deps; make clean; make compile
 
     jobs:
       - 'gerrit-{repos}'

-- 
To view, visit https://gerrit.osmocom.org/7406
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I07fee78bba5b07c7f3f4359869e00ef2583e0769
Gerrit-PatchSet: 4
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Stefan Sperling <ssperling at sysmocom.de>