set -o nounset
set -o pipefail
-cd $WORKSPACE/prototypes/xci
+cd $WORKSPACE/xci
# for daily jobs, we want to use working versions
# for periodic jobs, we will use whatever is set in the job, probably master
-if [[ "$XCI_LOOP" == "daily" ]]; then
+if [[ "$CI_LOOP" == "daily" ]]; then
# source pinned-vars to get releng version
source ./config/pinned-versions
# checkout the version
git checkout -q $OPNFV_RELENG_VERSION
echo "Info: Using $OPNFV_RELENG_VERSION"
-elif [[ "$XCI_LOOP" == "periodic" ]]; then
+elif [[ "$CI_LOOP" == "periodic" ]]; then
echo "Info: Using $OPNFV_RELENG_VERSION"
fi
# to take this into account while deploying anyways
# clone openstack-ansible
# stable/ocata already use pinned versions so this is only valid for master
-if [[ "$XCI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
+if [[ "$CI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
cd $WORKSPACE
# get the url to openstack-ansible git
source ./config/env-vars
fi
# proceed with the deployment
-cd $WORKSPACE/prototypes/xci
-sudo -E ./xci-deploy.sh
+cd $WORKSPACE/xci
+./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"