Improve python-tools-install.sh alpine compat

[releng/global-jjb.git] / shell / rtdv3.sh

diff --git a/shell/rtdv3.sh b/shell/rtdv3.sh
index 7b4fef8..08f98a2 100644 (file)
--- a/shell/rtdv3.sh
+++ b/shell/rtdv3.sh
@@ -18,7 +18,7 @@ watchbuild(){
   buildid=$(lftools rtd project-build-trigger "$rtdproject" "$1" | jq '.build.id')
 
   result=null
-  while [ $result == null ]; do
+  while [[ "$result" == null ]]; do
     sleep 10
     result=$(lftools rtd project-build-details "$rtdproject" "$buildid"  | jq '.success')
     echo "INFO Current result of running build $result"
@@ -41,6 +41,15 @@ fi
 #MASTER_RTD_PROJECT as a global jenkins cnt
 masterproject="$umbrella-$MASTER_RTD_PROJECT"
 
+#Exceptions needed for onap, due to importing their old docs.
+if [[ $masterproject == "onap-doc" ]]; then
+  masterproject="onap"
+fi
+if [[ $rtdproject == "onap-doc" ]]; then
+  rtdproject="onap"
+fi
+
+
 echo "INFO:"
 echo "INFO: Project: $PROJECT"
 echo "INFO: Read the Docs Sub Project: https://$rtdproject.readthedocs.io"
@@ -130,8 +139,8 @@ echo "INFO: Performing merge action"
     branch=$(echo "$GERRIT_BRANCH" | tr '[:upper:]' '[:lower:]')
     echo "INFO: Checking if read the docs has seen branch $branch"
 
-    #if this is 404. then run discover branch
-    if ! lftools rtd project-version-details "$rtdproject" "$branch" | jq '.active'; then
+    #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