Merge "Build and publish Promise's requirement doc"

diff --git a/jjb/promise/docu-build.sh b/jjb/promise/docu-build.sh
index 057cc97..c635a11 100644 (file)
--- a/jjb/promise/docu-build.sh
+++ b/jjb/promise/docu-build.sh
@@ -2,79 +2,21 @@
 set -e
 set -o pipefail
 
+build_dir="build"
 project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')"
 export PATH=$PATH:/usr/local/bin/
 
-git_sha1="$(git rev-parse HEAD)"
-docu_build_date="$(date)"
+make
 
-if [[ $JOB_NAME =~ "verify" ]] ; then
-      patchset="/$GERRIT_CHANGE_NUMBER"
-fi
-
-files=()
-while read -r -d ''; do
-       files+=("$REPLY")
-done < <(find * -type f -iname '*.rst' -print0)
+# upload all built files
+files=(
+    requirements/latex/*.pdf
+)
 
 for file in "${{files[@]}}"; do
-
-       file_cut="${{file%.*}}"
-       gs_cp_folder="${{file_cut}}"
-
-       # sed part
-       sed -i "s/_sha1_/$git_sha1/g" $file
-       sed -i "s/_date_/$docu_build_date/g" $file
-
-       # rst2html part
-       echo "rst2html $file"
-       rst2html $file | gsutil cp -L gsoutput.txt - \
-       gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html
-       gsutil setmeta -h "Content-Type:text/html" \
-                       -h "Cache-Control:private, max-age=0, no-transform" \
-                       gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html
-       cat gsoutput.txt
-       rm -f gsoutput.txt
-
-       echo "rst2pdf $file"
-       rst2pdf $file -o - | gsutil cp -L gsoutput.txt - \
-       gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf
-       gsutil setmeta -h "Content-Type:application/pdf" \
-                       -h "Cache-Control:private, max-age=0, no-transform" \
-                       gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf
-       cat gsoutput.txt
-       rm -f gsoutput.txt
-
-  links+="http://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html \n"
-  links+="http://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf \n"
-
+    gsutil cp -r -L gsoutput.txt $build_dir/$file gs://artifacts.opnfv.org/$project/
+    #gsutil setmeta -h "Cache-Control:private, max-age=0, no-transform" \
+    #-R gs://artifacts.opnfv.org/$project/$file
+    cat gsoutput.txt
+    rm -f gsoutput.txt
 done
-
-images=()
-while read -r -d ''; do
-        images+=("$REPLY")
-done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0)
-
-for img in "${{images[@]}}"; do
-
-       # uploading found images
-       echo "uploading $img"
-        cat "$img" | gsutil cp -L gsoutput.txt - \
-        gs://artifacts.opnfv.org/"$project""$patchset"/"$img"
-        gsutil setmeta -h "Content-Type:image/jpeg" \
-                        -h "Cache-Control:private, max-age=0, no-transform" \
-                        gs://artifacts.opnfv.org/"$project""$patchset"/"$img"
-        cat gsoutput.txt
-        rm -f gsoutput.txt
-
-done
-
-if [[ $GERRIT_EVENT_TYPE = "change-merged" ]] ; then
-    patchset="/$GERRIT_CHANGE_NUMBER"
-    if [ ! -z "$patchset" ]; then
-      gsutil rm gs://artifacts.opnfv.org/"$project""$patchset"/** || true
-    fi
-fi
-
-echo -e "$links"
-

diff --git a/jjb/promise/docu-verify.sh b/jjb/promise/docu-verify.sh
new file mode 100644 (file)
index 0000000..72d02cf
--- /dev/null
+++ b/jjb/promise/docu-verify.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+set -o pipefail
+
+export PATH=$PATH:/usr/local/bin/
+
+make

diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml
index 52db797..3196ef4 100644 (file)
--- a/jjb/promise/promise.yml
+++ b/jjb/promise/promise.yml
@@ -128,7 +128,7 @@
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw docu-verify.sh
 
 - job-template:
     name: 'promise-merge'