From 8b12756b2e200a830898b6e73e49969f4adca658 Mon Sep 17 00:00:00 2001 From: Victor Laza Date: Mon, 4 May 2015 10:14:18 +0300 Subject: Extend dynamic project variable in docu-build scripts JIRA: DOCS-26 - Extend dynamic project variable in docu-build scripts for functest, octopus, genesis & pharos Change-Id: I2bb699e7060754527fae4d7abe5b8fbf46c0a7dd Signed-off-by: Victor Laza --- jjb/functest/build-docu-verify.sh | 33 ------------------- jjb/functest/build-upload-docu.sh | 64 ------------------------------------- jjb/functest/docu-build.sh | 63 ++++++++++++++++++++++++++++++++++++ jjb/functest/docu-verify.sh | 33 +++++++++++++++++++ jjb/functest/functest.yml | 8 ++--- jjb/genesis/build-docu-verify.sh | 33 ------------------- jjb/genesis/build-upload-docu.sh | 67 --------------------------------------- jjb/genesis/docu-build.sh | 67 +++++++++++++++++++++++++++++++++++++++ jjb/genesis/docu-verify.sh | 33 +++++++++++++++++++ jjb/genesis/genesis-docs.yml | 4 +-- jjb/octopus/build-docu-verify.sh | 33 ------------------- jjb/octopus/build-upload-docu.sh | 64 ------------------------------------- jjb/octopus/docu-build.sh | 63 ++++++++++++++++++++++++++++++++++++ jjb/octopus/docu-verify.sh | 33 +++++++++++++++++++ jjb/octopus/octopus.yml | 6 ++-- jjb/pharos/build-docu-verify.sh | 33 ------------------- jjb/pharos/build-upload-docu.sh | 64 ------------------------------------- jjb/pharos/docu-build.sh | 63 ++++++++++++++++++++++++++++++++++++ jjb/pharos/docu-verify.sh | 33 +++++++++++++++++++ jjb/pharos/pharos.yml | 6 ++-- 20 files changed, 400 insertions(+), 403 deletions(-) delete mode 100644 jjb/functest/build-docu-verify.sh delete mode 100644 jjb/functest/build-upload-docu.sh create mode 100644 jjb/functest/docu-build.sh create mode 100644 jjb/functest/docu-verify.sh delete mode 100644 jjb/genesis/build-docu-verify.sh delete mode 100644 jjb/genesis/build-upload-docu.sh create mode 100644 jjb/genesis/docu-build.sh create mode 100644 jjb/genesis/docu-verify.sh delete mode 100644 jjb/octopus/build-docu-verify.sh delete mode 100644 jjb/octopus/build-upload-docu.sh create mode 100644 jjb/octopus/docu-build.sh create mode 100644 jjb/octopus/docu-verify.sh delete mode 100644 jjb/pharos/build-docu-verify.sh delete mode 100644 jjb/pharos/build-upload-docu.sh create mode 100644 jjb/pharos/docu-build.sh create mode 100644 jjb/pharos/docu-verify.sh diff --git a/jjb/functest/build-docu-verify.sh b/jjb/functest/build-docu-verify.sh deleted file mode 100644 index c692226dd..000000000 --- a/jjb/functest/build-docu-verify.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -project="functest" -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/functest/build-upload-docu.sh b/jjb/functest/build-upload-docu.sh deleted file mode 100644 index ee45d68a3..000000000 --- a/jjb/functest/build-upload-docu.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -project="functest" -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 | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project"/"$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 - 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 - 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 - 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"/"$img" - gsutil setmeta -h "Content-Type:image/jpeg" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://artifacts.opnfv.org/"$project"/"$img" - cat gsoutput.txt - rm -f gsoutput.txt - -done - diff --git a/jjb/functest/docu-build.sh b/jjb/functest/docu-build.sh new file mode 100644 index 000000000..499bdbe4b --- /dev/null +++ b/jjb/functest/docu-build.sh @@ -0,0 +1,63 @@ +#!/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 | gsutil cp -L gsoutput.txt - \ + gs://artifacts.opnfv.org/"$project"/"$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 + 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 + 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 + 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"/"$img" + gsutil setmeta -h "Content-Type:image/jpeg" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + gs://artifacts.opnfv.org/"$project"/"$img" + cat gsoutput.txt + rm -f gsoutput.txt + +done diff --git a/jjb/functest/docu-verify.sh b/jjb/functest/docu-verify.sh new file mode 100644 index 000000000..f337a7fae --- /dev/null +++ b/jjb/functest/docu-verify.sh @@ -0,0 +1,33 @@ +#!/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/functest/functest.yml b/jjb/functest/functest.yml index a4466f8a5..211af0c42 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -148,7 +148,7 @@ builders: - shell: - !include-raw build-upload-docu.sh + !include-raw docu-build.sh postbuilders: - test-macro @@ -202,7 +202,7 @@ builders: - shell: - !include-raw build-docu-verify.sh + !include-raw docu-verify.sh - job-template: name: 'functest-merge' @@ -251,6 +251,6 @@ branch-pattern: '**/master' builders: - - shell: - !include-raw build-upload-docu.sh + - shell: + !include-raw docu-build.sh diff --git a/jjb/genesis/build-docu-verify.sh b/jjb/genesis/build-docu-verify.sh deleted file mode 100644 index 06b374e16..000000000 --- a/jjb/genesis/build-docu-verify.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -project="genesis" -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="$(echo "$file"| cut -d "/" -f2,3)" - - # 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/genesis/build-upload-docu.sh b/jjb/genesis/build-upload-docu.sh deleted file mode 100644 index 2a6bbf725..000000000 --- a/jjb/genesis/build-upload-docu.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -project="genesis" -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="$(echo "$file"| cut -d "/" -f2,3)" - - # sed part - sed -i "s/_sha1_/$git_sha1/g" $file - sed -i "s/_date_/$docu_build_date/g" $file - - # rst2html part - html_file=$file_cut".html" - echo "rst2html $file" - rst2html $file | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$html_file") - gsutil setmeta -h "Content-Type:text/html" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$html_file") - cat gsoutput.txt - rm -f gsoutput.txt - - # rst2pdf part - pdf_file="$file_cut"".pdf" - echo "rst2pdf $file" - rst2pdf "$file" -o - | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$pdf_file") - gsutil setmeta -h "Content-Type:application/pdf" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$pdf_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"/"$img" - gsutil setmeta -h "Content-Type:image/jpeg" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://artifacts.opnfv.org/"$project"/"$img" - cat gsoutput.txt - rm -f gsoutput.txt - -done - diff --git a/jjb/genesis/docu-build.sh b/jjb/genesis/docu-build.sh new file mode 100644 index 000000000..bf69c0c75 --- /dev/null +++ b/jjb/genesis/docu-build.sh @@ -0,0 +1,67 @@ +#!/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="$(echo "$file"| cut -d "/" -f2,3)" + + # sed part + sed -i "s/_sha1_/$git_sha1/g" $file + sed -i "s/_date_/$docu_build_date/g" $file + + # rst2html part + html_file=$file_cut".html" + echo "rst2html $file" + rst2html $file | gsutil cp -L gsoutput.txt - \ + gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$html_file") + gsutil setmeta -h "Content-Type:text/html" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$html_file") + cat gsoutput.txt + rm -f gsoutput.txt + + # rst2pdf part + pdf_file="$file_cut"".pdf" + echo "rst2pdf $file" + rst2pdf "$file" -o - | gsutil cp -L gsoutput.txt - \ + gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$pdf_file") + gsutil setmeta -h "Content-Type:application/pdf" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$pdf_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"/"$img" + gsutil setmeta -h "Content-Type:image/jpeg" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + gs://artifacts.opnfv.org/"$project"/"$img" + cat gsoutput.txt + rm -f gsoutput.txt + +done + diff --git a/jjb/genesis/docu-verify.sh b/jjb/genesis/docu-verify.sh new file mode 100644 index 000000000..1f0c39564 --- /dev/null +++ b/jjb/genesis/docu-verify.sh @@ -0,0 +1,33 @@ +#!/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="$(echo "$file"| cut -d "/" -f2,3)" + + # 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/genesis/genesis-docs.yml b/jjb/genesis/genesis-docs.yml index 21c16f7ad..0b6379831 100644 --- a/jjb/genesis/genesis-docs.yml +++ b/jjb/genesis/genesis-docs.yml @@ -62,7 +62,7 @@ builders: - shell: - !include-raw build-upload-docu.sh + !include-raw docu-build.sh - job-template: name: 'genesis-verify-docs' @@ -115,5 +115,5 @@ builders: - shell: - !include-raw build-docu-verify.sh + !include-raw docu-verify.sh diff --git a/jjb/octopus/build-docu-verify.sh b/jjb/octopus/build-docu-verify.sh deleted file mode 100644 index 9c288fa12..000000000 --- a/jjb/octopus/build-docu-verify.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -project="octopus" -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/build-upload-docu.sh b/jjb/octopus/build-upload-docu.sh deleted file mode 100644 index fdd1463d7..000000000 --- a/jjb/octopus/build-upload-docu.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -project="octopus" -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 | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project"/"$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 - 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 - 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 - 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"/"$img" - gsutil setmeta -h "Content-Type:image/jpeg" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://artifacts.opnfv.org/"$project"/"$img" - cat gsoutput.txt - rm -f gsoutput.txt - -done - diff --git a/jjb/octopus/docu-build.sh b/jjb/octopus/docu-build.sh new file mode 100644 index 000000000..499bdbe4b --- /dev/null +++ b/jjb/octopus/docu-build.sh @@ -0,0 +1,63 @@ +#!/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 | gsutil cp -L gsoutput.txt - \ + gs://artifacts.opnfv.org/"$project"/"$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 + 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 + 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 + 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"/"$img" + gsutil setmeta -h "Content-Type:image/jpeg" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + gs://artifacts.opnfv.org/"$project"/"$img" + cat gsoutput.txt + rm -f gsoutput.txt + +done diff --git a/jjb/octopus/docu-verify.sh b/jjb/octopus/docu-verify.sh new file mode 100644 index 000000000..f337a7fae --- /dev/null +++ b/jjb/octopus/docu-verify.sh @@ -0,0 +1,33 @@ +#!/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 c72292c8f..459ba7a01 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -74,7 +74,7 @@ builders: - shell: - !include-raw build-upload-docu.sh + !include-raw docu-build.sh postbuilders: - test-macro @@ -128,7 +128,7 @@ builders: - shell: - !include-raw build-docu-verify.sh + !include-raw docu-verify.sh - job-template: name: 'octopus-merge' @@ -176,5 +176,5 @@ builders: - shell: - !include-raw build-upload-docu.sh + !include-raw docu-build.sh diff --git a/jjb/pharos/build-docu-verify.sh b/jjb/pharos/build-docu-verify.sh deleted file mode 100644 index 50d387079..000000000 --- a/jjb/pharos/build-docu-verify.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -project="pharos" -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/pharos/build-upload-docu.sh b/jjb/pharos/build-upload-docu.sh deleted file mode 100644 index 50191e517..000000000 --- a/jjb/pharos/build-upload-docu.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -project="pharos" -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 | gsutil cp -L gsoutput.txt - \ - gs://artifacts.opnfv.org/"$project"/"$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 - 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 - 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 - 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"/"$img" - gsutil setmeta -h "Content-Type:image/jpeg" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://artifacts.opnfv.org/"$project"/"$img" - cat gsoutput.txt - rm -f gsoutput.txt - -done - diff --git a/jjb/pharos/docu-build.sh b/jjb/pharos/docu-build.sh new file mode 100644 index 000000000..499bdbe4b --- /dev/null +++ b/jjb/pharos/docu-build.sh @@ -0,0 +1,63 @@ +#!/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 | gsutil cp -L gsoutput.txt - \ + gs://artifacts.opnfv.org/"$project"/"$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 + 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 + 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 + 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"/"$img" + gsutil setmeta -h "Content-Type:image/jpeg" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + gs://artifacts.opnfv.org/"$project"/"$img" + cat gsoutput.txt + rm -f gsoutput.txt + +done diff --git a/jjb/pharos/docu-verify.sh b/jjb/pharos/docu-verify.sh new file mode 100644 index 000000000..f337a7fae --- /dev/null +++ b/jjb/pharos/docu-verify.sh @@ -0,0 +1,33 @@ +#!/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/pharos/pharos.yml b/jjb/pharos/pharos.yml index 8b5a01251..89f6a392a 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -72,7 +72,7 @@ builders: - shell: - !include-raw build-upload-docu.sh + !include-raw docu-build.sh postbuilders: - test-macro @@ -126,7 +126,7 @@ builders: - shell: - !include-raw build-docu-verify.sh + !include-raw docu-verify.sh - job-template: name: 'pharos-merge' @@ -176,5 +176,5 @@ builders: - shell: - !include-raw build-upload-docu.sh + !include-raw docu-build.sh -- cgit 1.2.3-korg