X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fgerrit-depends-on.sh;h=7f62f82d6fe52699035bbdae059f8eb268f0016c;hb=32dae18e9f1860e274a91cf31c0f21825b2ee71a;hp=7b47b9341f250e46878dc983f28bc36ea713eef2;hpb=edb933dd7f136fbbee8ab89bd5231d5bf933583d;p=lttng-ci.git

diff --git a/scripts/lttng-tools/gerrit-depends-on.sh b/scripts/lttng-tools/gerrit-depends-on.sh
index 7b47b93..7f62f82 100755
--- a/scripts/lttng-tools/gerrit-depends-on.sh
+++ b/scripts/lttng-tools/gerrit-depends-on.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 # shellcheck disable=SC2103
 #
 # Copyright (C) 2020 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -exu
+
 #Required variables
 GERRIT_NAME=${GERRIT_NAME:-}
 WORKSPACE=${WORKSPACE:-}
@@ -24,6 +26,7 @@ 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"
 re="Depends-on: (${possible_depends_on}): ([^'$'\n'']*)"
@@ -71,6 +74,24 @@ 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")
+    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 abandonned. 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
+
     git clone "${gerrit_url}/${project}" "$WORKSPACE/src/$project"
     pushd "$WORKSPACE/src/$project"
     git fetch "${gerrit_url}/${project}" "$ref"