X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-deploy.sh;h=71cf96d8d2ca6a5f852397c60d3a3a69795882a3;hb=28f7d7c0ef101a6660b743620e0f2d5aa3e8993e;hp=cf5fe32d31d453adb2b8bca56e352b1539764bd1;hpb=a5bf56b11e3b61a1ae6cbe34b9a88603f322a7ab;p=releng.git

diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh
index cf5fe32d3..71cf96d8d 100755
--- a/jjb/xci/xci-deploy.sh
+++ b/jjb/xci/xci-deploy.sh
@@ -11,21 +11,65 @@ set -o errexit
 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 [[ "$JOB_NAME" =~ "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 [[ "$JOB_NAME" =~ "periodic" ]]; then
+elif [[ "$CI_LOOP" == "periodic" ]]; then
     echo "Info: Using $OPNFV_RELENG_VERSION"
 fi
 
+# this is just an example to give the idea about what we need to do
+# so ignore this part for the timebeing as we need to adjust xci-deploy.sh
+# 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 [[ "$CI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
+    cd $WORKSPACE
+    # get the url to openstack-ansible git
+    source ./config/env-vars
+    echo "Info: Capture the ansible role requirement versions before doing anything"
+    git clone -q $OPENSTACK_OSA_GIT_URL
+    cd openstack-ansible
+    cat ansible-role-requirements.yml | while IFS= read -r line
+    do
+        if [[ $line =~ "src:" ]]; then
+            repo_url=$(echo $line | awk {'print $2'})
+            repo_sha1=$(git ls-remote $repo_url $OPENSTACK_OSA_VERSION | awk {'print $1'})
+        fi
+        echo "$line" | sed -e "s|master|$repo_sha1|" >> opnfv-ansible-role-requirements.yml
+    done
+    echo "Info: SHA1s of ansible role requirements"
+    echo "-------------------------------------------------------------------------"
+    cat opnfv-ansible-role-requirements.yml
+    echo "-------------------------------------------------------------------------"
+fi
+
 # proceed with the deployment
-cd $WORKSPACE/prototypes/xci
-sudo -E ./xci-deploy.sh
+cd $WORKSPACE/xci
+./xci-deploy.sh
+
+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 "***********************************************************************"
+fi
+
+echo -e "\n"