jjb: Use lttng-modules from gerrit when depends-on is set

[lttng-ci.git] / scripts / lttng-tools / gerrit-depends-on.sh

diff --git a/scripts/lttng-tools/gerrit-depends-on.sh b/scripts/lttng-tools/gerrit-depends-on.sh
index 33fd9d48ddc0e6ecd6e7b6683ac2d29fdf9e5130..e568578a3c99e2fc05e573fce8758c744058cb2d 100755 (executable)
--- a/scripts/lttng-tools/gerrit-depends-on.sh
+++ b/scripts/lttng-tools/gerrit-depends-on.sh
@@ -28,7 +28,7 @@ gerrit_query="&o=CURRENT_REVISION&o=DOWNLOAD_COMMANDS"
 gerrit_json_query=".[0].revisions[.[0].current_revision].ref"
 gerrit_json_query_status=".[0].status"
 
-possible_depends_on="lttng-ust|lttng-modules|userspace-rcu"
+possible_depends_on="lttng-ust|lttng-modules|userspace-rcu|babeltrace"
 re="Depends-on: (${possible_depends_on}): ([^'$'\n'']*)"
 property_file="${WORKSPACE}/gerrit_custom_dependencies.properties"
 
@@ -61,12 +61,9 @@ git rev-list --format=%B --max-count=1 HEAD | while read -r line; do
     if [ "$project" = "lttng-modules" ]; then
         if [ -d "$WORKSPACE/src/lttng-modules" ]; then
             # Remove the regular modules sources to replace them with those
-           # from the gerrit change
+            # from the gerrit change
             rm -rf "$WORKSPACE/src/lttng-modules"
-        else
-            # This job does not require modules sources
-            continue
-       fi
+        fi
     fi
 
     # Export the GERRIT_DEP_... into the property file for further jenkins usage