From 28eff46deb4d128d2edfbca1318c2c1953a64d8d Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 20 Mar 2018 19:25:44 +0100 Subject: [PATCH] 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 --- jobs/gerrit-verifications.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 640bde7f..76138024 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}'