X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fgerrit-depends-on.sh;h=42b6225cbc428e902359a184ad94e40b1785c212;hb=b9852a53285060d38146fcf28a841713941ebe06;hp=b8bcd4e9a30d6b07da061534bcaa6adbf7918c30;hpb=51c9c62db1805a4cdd96be18df4082f1ac5d81c5;p=lttng-ci.git

diff --git a/scripts/lttng-tools/gerrit-depends-on.sh b/scripts/lttng-tools/gerrit-depends-on.sh
index b8bcd4e..42b6225 100755
--- a/scripts/lttng-tools/gerrit-depends-on.sh
+++ b/scripts/lttng-tools/gerrit-depends-on.sh
@@ -26,8 +26,9 @@ conf=${conf:-}
 gerrit_url="https://${GERRIT_NAME}"
 gerrit_query="?o=CURRENT_REVISION&o=DOWNLOAD_COMMANDS"
 gerrit_json_query=".revisions[.current_revision].ref"
+gerrit_json_query_status=".status"
 
-possible_depends_on="lttng-ust|lttng-modules"
+possible_depends_on="lttng-ust|lttng-modules|userspace-rcu"
 re="Depends-on: (${possible_depends_on}): ([^'$'\n'']*)"
 property_file="${WORKSPACE}/gerrit_custom_dependencies.properties"
 
@@ -73,8 +74,36 @@ git rev-list --format=%B --max-count=1 HEAD | while read -r line; do
 
     # Get the change latest ref
     ref=$(curl "${gerrit_url}/changes/${gerrit_id}${gerrit_query}" | tail -n+2 | jq -r "$gerrit_json_query")
-    git clone "${gerrit_url}/${project}" "$WORKSPACE/src/$project"
-    pushd "$WORKSPACE/src/$project"
+    change_status=$(curl "${gerrit_url}/changes/${gerrit_id}${gerrit_query}" | tail -n+2 | jq -r "$gerrit_json_query_status")
+    if [ "$change_status" == "MERGED" ]; then
+	    # When the change we depends on is merged use master as the ref.
+	    # This is not ideal CI time wise since we do not reuse artifacts.
+	    # This solve a tricky situation where we actually want to use master
+	    # instead of the change available on gerrit. Intermediary changes
+	    # present in master could have an impact on the change under test.
+	    ref="refs/heads/master"
+    elif [ "$change_status" == "ABANDONED" ]; then
+	    # We have a situation where the "HEAD" commit for feature branch are
+	    # not merged and abandoned. Default to the master branch and hope
+	    # for the best. This is far from ideal but we need might also need
+	    # to find a better way to handle feature branch here. In the
+	    # meantime use master for such cases.
+	    echo "Depends-on change is ABANDONED. Defaulting to master"
+	    ref="refs/heads/master"
+    fi
+
+    # The build.sh script from userspace-rcu expects the source to be located in
+    # `liburcu` instead of userspace-rcu. Accommodate for this here.
+    if [ "$project" = "userspace-rcu" ]; then
+        clone_directory="liburcu"
+    else
+	clone_directory="$project"
+    fi
+
+    clone_directory="$WORKSPACE/src/$clone_directory"
+
+    git clone "${gerrit_url}/${project}" "$clone_directory"
+    pushd "$clone_directory"
     git fetch "${gerrit_url}/${project}" "$ref"
     git checkout FETCH_HEAD
     popd