summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2015-08-27 08:09:48 -0400
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-08-27 12:39:15 +0000
commite531f55f5f62667708b35ae5a48fc0742ecb6240 (patch)
tree099db20d25b0f31d1d5bc92134ae1de083138cf8 /jjb
parent657a5a92a54fe7feaa71bc5a3beea590622d16d4 (diff)
Fix all the ugly formatting that I left in due to end of day fatigue.
Change-Id: I0bbda7c5e0a8c394545049bf3119a1465862eeaf Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/releng/docu-build-new.sh77
1 files changed, 37 insertions, 40 deletions
diff --git a/jjb/releng/docu-build-new.sh b/jjb/releng/docu-build-new.sh
index cecd65c81..8c0cc49bb 100755
--- a/jjb/releng/docu-build-new.sh
+++ b/jjb/releng/docu-build-new.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
set -e
set -o pipefail
@@ -9,13 +9,13 @@ if [[ -d docs/output ]]; then
rm -rf docs/output
echo "cleaning up output directory"
fi
-}}
+}}
trap clean EXIT TERM INT SIGTERM SIGHUP
directories=()
while read -d $'\n'; do
- directories+=("$REPLY")
+ directories+=("$REPLY")
done < <(find docs/ -name 'index.rst' -printf '%h\n' | sort -u )
for dir in "${{directories[@]}}"; do
@@ -36,44 +36,41 @@ done
[[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
[[ $GERRIT_PROJECT =~ .+ ]]
[[ $GERRIT_BRANCH =~ .+ ]]
+gs_path_review="artifacts.opnfv.org/review/$GERRIT_CHANGE_NUMBER"
-directories=()
-while read -d $'\n'; do
- directories+=("$REPLY")
- done < <(find docs/ -name 'index.rst' -printf '%h\n' | sort -u )
-
- for dir in "${{directories[@]}}"; do
- echo
- echo "#############################"
- echo "UPLOADING DOCS in ${{dir##*/}}"
- echo "#############################"
- echo
-
- gs_path_review="artifacts.opnfv.org/review/$GERRIT_CHANGE_NUMBER"
- if [[ $GERRIT_BRANCH = "master" ]] ; then
- gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT"
- else
- gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT/${{GERRIT_BRANCH##*/}}"
- fi
-
- if [[ $JOB_NAME =~ "verify" ]] ; then
- gsutil cp -r docs/output/"${{dir##*/}}/" "gs://$gs_path_review/"
- # post link to gerrit as comment
- gerrit_comment="$(echo '"Document is available at 'http://$gs_path_review/"${{dir##*/}}"/index.html' for review"')"
- echo "$gerrit_comment"
- ssh -p 29418 gerrit.opnfv.org gerrit review -p $GERRIT_PROJECT -m \
- "$gerrit_comment" $GERRIT_PATCHSET_REVISION
- else
- gsutil cp -r docs/output/"${{dir##*/}}/" "gs://$gs_path_branch/"
-
- echo "Latest document is available at http://$gs_path_branch/index.html"
-
- if gsutil ls "gs://$gs_path_review" > /dev/null 2>&1 ; then
- echo
- echo "Deleting Out-of-dated Documents..."
- gsutil rm -r "gs://$gs_path_review"
- fi
- fi
+for dir in "${{directories[@]}}"; do
+ echo
+ echo "#############################"
+ echo "UPLOADING DOCS in ${{dir##*/}}"
+ echo "#############################"
+ echo
+ if [[ $GERRIT_BRANCH = "master" ]] ; then
+ gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT"
+ else
+ gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT/${{GERRIT_BRANCH##*/}}"
+ fi
+
+ if [[ $JOB_NAME =~ "verify" ]] ; then
+ gsutil cp -r docs/output/"${{dir##*/}}/" "gs://$gs_path_review/"
+ # post link to gerrit as comment
+ gerrit_comment="$(echo '"Document is available at 'http://$gs_path_review/"${{dir##*/}}"/index.html' for review"')"
+ echo "$gerrit_comment"
+ ssh -p 29418 gerrit.opnfv.org gerrit review -p $GERRIT_PROJECT -m \
+ "$gerrit_comment" $GERRIT_PATCHSET_REVISION
+
+ else
+
+ gsutil cp -r docs/output/"${{dir##*/}}/" "gs://$gs_path_branch/"
+ echo "Latest document is available at http://$gs_path_branch/index.html"
+
+ #Clean up review when merging
+ if gsutil ls "gs://$gs_path_review" > /dev/null 2>&1 ; then
+ echo
+ echo "Deleting Out-of-dated Documents..."
+ gsutil rm -r "gs://$gs_path_review"
+ fi
+
+ fi
done