From 48ab117d2ea598c6302b34a163db8250e3383605 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 20 Apr 2016 09:38:56 -0400
Subject: [PATCH] functions: add defaults for ZUUL_BRANCH & ZUUL_REF

When running periodic jobs, ZUUL_BRANCH & ZUUL_REF are empty because we
don't have any reference or branch set for the jobs.
To not make zuul failing when cloning Puppet modules, let's set defaults
values:

ZUUL_BRANCH default to master (we are running tests against master now)
If we need to test stable branches, we'll revisit later but it would be
a bigger change (job names, etc).

ZUUL_REF default to None.

Change-Id: I34b298230bc174a3fdd431095043543c4c223296
---
 functions | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/functions b/functions
index 4981926a7..91edb9473 100644
--- a/functions
+++ b/functions
@@ -17,8 +17,8 @@ install_external() {
 #
 # - ``PUPPETFILE_DIR`` must be set to Puppet modules directory
 # - ``SCRIPT_DIR`` must be set to script path
-# - ``ZUUL_REF`` must be set to Zuul ref
-# - ``ZUUL_BRANCH`` must be set to Zuul branch
+# - ``ZUUL_REF`` must be set to Zuul ref. Fallback to 'None'.
+# - ``ZUUL_BRANCH`` must be set to Zuul branch. Fallback to 'master'.
 # - ``ZUUL_URL`` must be set to Zuul URL
 install_openstack() {
   cat > clonemap.yaml <<EOF
@@ -27,6 +27,10 @@ clonemap:
     dest: '$PUPPETFILE_DIR/\2'
 EOF
 
+  # Periodic jobs run without ref on master
+  ZUUL_REF=${ZUUL_REF:-None}
+  ZUUL_BRANCH=${ZUUL_BRANCH:-master}
+
   local project_names=$(awk '{ if ($1 == ":git") print $3 }' \
     ${SCRIPT_DIR}/Puppetfile0 | tr -d "'," | cut -d '/' -f 4- | xargs
   )