From 7483abb226a1f23523f4057ff237af0261653438 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 5 Dec 2016 16:34:08 -0800 Subject: [PATCH] Add fallback branch until CI configuration is fixed to pass GIT_BRANCH Original commit: elastic/x-pack-elasticsearch@68d12b33e927438c5b69be837f8c0be15fb56763 --- dev-tools/ci | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-tools/ci b/dev-tools/ci index 09db5f66c6b..d34b046b6cf 100755 --- a/dev-tools/ci +++ b/dev-tools/ci @@ -68,7 +68,8 @@ if [ -z ${USE_EXISTING_ES:+x} ]; then echo "Either define 'USE_EXISTING_ES' or remove the existing 'elasticsearch' sibling." exit 1 fi - BRANCH=${PR_SOURCE_BRANCH:-$GIT_BRANCH} # fall back to CI branch if not testing a PR + # AWAITSFIX: the fallback to master should be removed, see https://github.com/elastic/infra/issues/1557 + BRANCH=${PR_SOURCE_BRANCH:-${GIT_BRANCH:-master}} # fall back to CI branch if not testing a PR echo "Checking if branch '$BRANCH' has elasticsearch sibling..." if [[ -z "$(git ls-remote --heads git@github.com:elastic/elasticsearch.git $BRANCH)" ]]; then echo "No sibling branch, using PR target branch"