Merge "barometer: include the barometer-project-parameter"

[releng.git] / jjb / xci / xci-deploy.sh

diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh
index 1ef4e82..8ad6378 100755 (executable)
--- a/jjb/xci/xci-deploy.sh
+++ b/jjb/xci/xci-deploy.sh
@@ -54,20 +54,22 @@ fi
 
 # proceed with the deployment
 cd $WORKSPACE/prototypes/xci
-sudo -E ./xci-deploy.sh
+./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"