From: Victor Laza Date: Mon, 20 Apr 2015 10:23:22 +0000 (+0300) Subject: Separate merge and verify script contents to avoid gs upload X-Git-Tag: arno.2015.1.0~92 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=de61c2157175d5795465d010807d5eb15a92f909;p=releng.git Separate merge and verify script contents to avoid gs upload JIRA: DOCS-22 - Separate merge and verify script contents to avoid gs upload Needs to be done under releng jjb for all R1 projects Change-Id: If9b4815e733a6b773f49f0dc3cd6da84618979fd Signed-off-by: Victor Laza --- diff --git a/jjb/functest/build-docu-verify.sh b/jjb/functest/build-docu-verify.sh new file mode 100644 index 000000000..e8f34a784 --- /dev/null +++ b/jjb/functest/build-docu-verify.sh @@ -0,0 +1,30 @@ +#!/bin/bash +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-docu.sh b/jjb/functest/build-upload-docu.sh similarity index 100% rename from jjb/functest/build-docu.sh rename to jjb/functest/build-upload-docu.sh diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 9c1ca084a..8ef926914 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -146,7 +146,7 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-upload-docu.sh postbuilders: - test-macro @@ -198,7 +198,7 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-docu-verify.sh - job-template: name: 'functest-merge' @@ -246,5 +246,5 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-upload-docu.sh diff --git a/jjb/octopus/build-docu-verify.sh b/jjb/octopus/build-docu-verify.sh new file mode 100644 index 000000000..01338efe4 --- /dev/null +++ b/jjb/octopus/build-docu-verify.sh @@ -0,0 +1,30 @@ +#!/bin/bash +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-docu.sh b/jjb/octopus/build-upload-docu.sh similarity index 100% rename from jjb/octopus/build-docu.sh rename to jjb/octopus/build-upload-docu.sh diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index 923696eb6..c72292c8f 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -74,7 +74,7 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-upload-docu.sh postbuilders: - test-macro @@ -128,7 +128,7 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-docu-verify.sh - job-template: name: 'octopus-merge' @@ -176,5 +176,5 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-upload-docu.sh diff --git a/jjb/opnfvdocs/build-docu-verify.sh b/jjb/opnfvdocs/build-docu-verify.sh new file mode 100644 index 000000000..061e46d22 --- /dev/null +++ b/jjb/opnfvdocs/build-docu-verify.sh @@ -0,0 +1,30 @@ +#!/bin/bash +project="opnfvdocs" +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/opnfvdocs/build-docu.sh b/jjb/opnfvdocs/build-upload-docu.sh similarity index 100% rename from jjb/opnfvdocs/build-docu.sh rename to jjb/opnfvdocs/build-upload-docu.sh diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml index 532532787..2d3945227 100644 --- a/jjb/opnfvdocs/opnfvdocs.yml +++ b/jjb/opnfvdocs/opnfvdocs.yml @@ -49,7 +49,7 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-upload-docu.sh - job-template: name: 'opnfvdocs-verify' @@ -98,7 +98,7 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-docu-verify.sh - job-template: name: 'opnfvdocs-merge' @@ -146,5 +146,5 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-upload-docu.sh diff --git a/jjb/pharos/build-docu-verify.sh b/jjb/pharos/build-docu-verify.sh new file mode 100644 index 000000000..46862d913 --- /dev/null +++ b/jjb/pharos/build-docu-verify.sh @@ -0,0 +1,30 @@ +#!/bin/bash +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-docu.sh b/jjb/pharos/build-upload-docu.sh similarity index 100% rename from jjb/pharos/build-docu.sh rename to jjb/pharos/build-upload-docu.sh diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 004ea8cd1..85f03b799 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -70,7 +70,7 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-upload-docu.sh postbuilders: - test-macro @@ -122,7 +122,7 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-docu-verify.sh - job-template: name: 'pharos-merge' @@ -170,5 +170,5 @@ builders: - shell: - !include-raw build-docu.sh + !include-raw build-upload-docu.sh