diff options
Diffstat (limited to 'jjb/octopus')
| -rw-r--r-- | jjb/octopus/docu-build.sh | 29 | ||||
| -rw-r--r-- | jjb/octopus/docu-verify.sh | 33 | ||||
| -rw-r--r-- | jjb/octopus/octopus.yml | 2 |
3 files changed, 24 insertions, 40 deletions
diff --git a/jjb/octopus/docu-build.sh b/jjb/octopus/docu-build.sh index 499bdbe4b..057cc97d1 100644 --- a/jjb/octopus/docu-build.sh +++ b/jjb/octopus/docu-build.sh @@ -8,6 +8,10 @@ export PATH=$PATH:/usr/local/bin/ git_sha1="$(git rev-parse HEAD)" docu_build_date="$(date)" +if [[ $JOB_NAME =~ "verify" ]] ; then + patchset="/$GERRIT_CHANGE_NUMBER" +fi + files=() while read -r -d ''; do files+=("$REPLY") @@ -25,22 +29,25 @@ for file in "${{files[@]}}"; do # rst2html part echo "rst2html $file" rst2html $file | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".html + 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"/"$gs_cp_folder".html + 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"/"$gs_cp_folder".pdf + 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"/"$gs_cp_folder".pdf + 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" + done images=() @@ -53,11 +60,21 @@ for img in "${{images[@]}}"; do # uploading found images echo "uploading $img" cat "$img" | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project"/"$img" + 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"/"$img" + 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/octopus/docu-verify.sh b/jjb/octopus/docu-verify.sh deleted file mode 100644 index f337a7fae..000000000 --- a/jjb/octopus/docu-verify.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -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)" - -files=() -while read -r -d ''; do - files+=("$REPLY") -done < <(find * -type f -iname '*.rst' -print0) - -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 > $file_cut".html" - - echo "rst2pdf $file" - rst2pdf $file -o $file_cut".pdf" - -done - diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index b89912c65..fe1713c73 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -134,7 +134,7 @@ builders: - shell: - !include-raw docu-verify.sh + !include-raw docu-build.sh - job-template: name: 'octopus-merge' |