X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Frtdv3.sh;h=314ce9ffa1acf0e31f28e23ab1099d0f7cecc971;hb=9047db7d4c426865d55683e4beced7d69e1f8770;hp=29808afaf433b5ee8f9de0db3c9b7693e2a70d84;hpb=fc8963fdf93dfb1997bb8b11558c3876a2f75751;p=releng%2Fglobal-jjb.git

diff --git a/shell/rtdv3.sh b/shell/rtdv3.sh
index 29808afa..314ce9ff 100644
--- a/shell/rtdv3.sh
+++ b/shell/rtdv3.sh
@@ -11,6 +11,25 @@
 echo "---> rtdv3.sh"
 set -euo pipefail
 
+watchbuild(){
+  echo "INFO: Running build against branch $1"
+  local buildid
+  local result
+  buildid=$(lftools rtd project-build-trigger "$rtdproject" "$1" | jq '.build.id')
+
+  result=null
+  while [ $result == null ]; do
+    sleep 10
+    result=$(lftools rtd project-build-details "$rtdproject" "$buildid"  | jq '.success')
+    echo "INFO Current result of running build $result"
+    if [[ $result == failed ]]; then
+      echo "INFO: read the docs build completed with status: $result"
+      exit 1
+    fi
+  done
+  echo "INFO: read the docs build completed with status: $result"
+}
+
 project_dashed="${PROJECT////-}"
 umbrella=$(echo "$GERRIT_URL" | awk -F'.' '{print $2}')
 if [[ "$SILO" == "sandbox" ]]; then
@@ -22,6 +41,12 @@ fi
 #MASTER_RTD_PROJECT as a global jenkins cnt
 masterproject="$umbrella-$MASTER_RTD_PROJECT"
 
+#Exception needed for onap, due to importing their old docs.
+if [[ $masterproject == "onap-doc" ]]; then
+  masterproject="onap"
+fi
+
+
 echo "INFO:"
 echo "INFO: Project: $PROJECT"
 echo "INFO: Read the Docs Sub Project: https://$rtdproject.readthedocs.io"
@@ -102,12 +127,31 @@ echo "INFO: Performing merge action"
     lftools rtd project-update "$rtdproject" default_version="$default_version"
   fi
 
-  lftools rtd project-build-trigger "$rtdproject" "$GERRIT_BRANCH"
   if [[ $GERRIT_BRANCH == "master" ]]; then
-    echo "INFO: triggering latest"
-    lftools rtd project-build-trigger "$rtdproject" latest
+    echo "INFO: triggering $rtdproject latest"
+    watchbuild latest
   else
-    echo "INFO: triggering stable"
-    lftools rtd project-build-trigger "$rtdproject" stable
+
+    #read the docs only understands lower case branch names
+    branch=$(echo "$GERRIT_BRANCH" | tr '[:upper:]' '[:lower:]')
+    echo "INFO: Checking if read the docs has seen branch $branch"
+
+    #if this is 200 "null" Then run discover branch
+    if [[ $(lftools rtd project-version-details "$rtdproject" "$branch" | jq '.active') == "null" ]]; then
+      echo "INFO: read the docs has not seen branch $branch for project $rtdproject"
+      echo "INFO: triggering $rtdproject latest to instantiate new branch discovery"
+      watchbuild latest
+    fi
+
+    echo "INFO: triggering $rtdproject $branch"
+    watchbuild "$branch"
+
+    #Make newly discovered branches visible in the u/i
+    isactive=$(lftools rtd project-version-details "$rtdproject" "$branch" | jq '.active')
+    if [[ "$isactive" == false ]]; then
+      echo "INFO: Marking $branch as active for project $rtdproject"
+      lftools rtd project-version-update "$rtdproject" "$branch" true
+    fi
+
   fi
 fi