From 2a88be0510fbe4695515097e98d996320c1bdcf9 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 4 Apr 2017 08:40:06 -0700 Subject: [PATCH] xci: Do not log info to console if running daily deployment Periodic and daily jobs use same script and we should not log info about osa sha1 to pin into console if it is not run as part of periodic job. Change-Id: I8203a822638603af92fd046d8038a3b4122dbf37 Signed-off-by: Fatih Degirmenci --- jjb/xci/xci-deploy.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh index 33457b9f0..07ca795da 100755 --- a/jjb/xci/xci-deploy.sh +++ b/jjb/xci/xci-deploy.sh @@ -56,18 +56,20 @@ fi cd $WORKSPACE/prototypes/xci sudo -E ./xci-deploy.sh -# if we arrived here without failing, it means we have something we can pin -# this is again here to show the intention -cd $WORKSPACE/openstack-ansible -OSA_GIT_SHA1=$(git rev-parse HEAD) +if [[ "$JOB_NAME" =~ "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then + # if we arrived here without failing, it means we have something we can pin + # this is again here to show the intention + cd $WORKSPACE/openstack-ansible + OSA_GIT_SHA1=$(git rev-parse HEAD) -# log some info -echo -e "\n" -echo "***********************************************************************" -echo "* OSA SHA1 TO PIN *" -echo "* *" -echo " $OSA_GIT_SHA1" -echo "* *" -echo "***********************************************************************" + # log some info + echo -e "\n" + echo "***********************************************************************" + echo "* OSA SHA1 TO PIN *" + echo "* *" + echo " $OSA_GIT_SHA1" + echo "* *" + echo "***********************************************************************" +fi echo -e "\n" -- 2.16.6