summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-04-12 10:51:52 -0400
committerDan Radez <dradez@redhat.com>2016-04-12 10:51:52 -0400
commit0bb3dc9baa4696c535d86bab6eba54df625442c4 (patch)
tree021a9e9378d2e61b1fcc3e258787775c697f8b8a
parent531e440adbda718f934ad0932cbb8483a419072e (diff)
fixing PR_NUMBER evaluation when there is no opnfv-tht-pr in the commit message
Change-Id: I5abd9efe48a665f7a65201ec20805cd1a4001763 Signed-off-by: Dan Radez <dradez@redhat.com>
-rwxr-xr-xbuild/undercloud.sh6
1 files changed, 5 insertions, 1 deletions
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