From 0bb3dc9baa4696c535d86bab6eba54df625442c4 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 12 Apr 2016 10:51:52 -0400 Subject: fixing PR_NUMBER evaluation when there is no opnfv-tht-pr in the commit message Change-Id: I5abd9efe48a665f7a65201ec20805cd1a4001763 Signed-off-by: Dan Radez --- build/undercloud.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'build/undercloud.sh') diff --git a/build/undercloud.sh b/build/undercloud.sh index ca75bb0e..3ac46e0f 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -31,10 +31,14 @@ LIBGUESTFS_BACKEND=direct virt-customize \ -a undercloud.qcow2 # Use apex tripleo-heat-templates fork -PR_NUMBER=$(git log -1 | grep 'opnfv-tht-pr:' | grep -o '[0-9]*') +PR_NUMBER="" REF="stable/colorado" REPO="https://github.com/trozet/opnfv-tht" +if git log -1 | grep 'opnfv-tht-pr:' | grep -o '[0-9]*'; then + PR_NUMBER=$(git log -1 | grep 'opnfv-tht-pr:' | grep -o '[0-9]*') +fi + if [ "$PR_NUMBER" != "" ]; then echo "Using pull request $PR_NUMBER from $REPO" # Source credentials since we are rate limited to 60/day -- cgit 1.2.3-korg