diff options
author | Victor Laza <vlaza@cloudbasesolutions.com> | 2015-04-20 09:54:51 +0300 |
---|---|---|
committer | Victor Laza <vlaza@cloudbasesolutions.com> | 2015-04-20 10:29:06 +0300 |
commit | 3a58ada482a61762854c8f0285714f291dc698d8 (patch) | |
tree | 538f4ce191f62cb6a27d93200b50755e3d489cd2 | |
parent | b0af53b33eed583eb273b0a5ebbf342c3ead12f9 (diff) |
Expanding artifacts management for R1 inside build-docu.sh
JIRA: DOCU-20 - Expanding artifacts management for R1 inside build-docu.sh
Change-Id: I4e8ac6bce3f6c47aff56e89e8133d2b4e547ff87
Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>
-rw-r--r-- | jjb/functest/build-docu.sh | 47 | ||||
-rw-r--r-- | jjb/functest/functest.yml | 18 | ||||
-rw-r--r-- | jjb/octopus/build-docu.sh | 47 | ||||
-rw-r--r-- | jjb/octopus/octopus.yml | 9 | ||||
-rw-r--r-- | jjb/opnfvdocs/build-docu.sh | 56 | ||||
-rw-r--r-- | jjb/pharos/build-docu.sh | 47 | ||||
-rw-r--r-- | jjb/pharos/pharos.yml | 20 |
7 files changed, 148 insertions, 96 deletions
diff --git a/jjb/functest/build-docu.sh b/jjb/functest/build-docu.sh index ca9ecd0d3..bd5abdbf2 100644 --- a/jjb/functest/build-docu.sh +++ b/jjb/functest/build-docu.sh @@ -1,9 +1,42 @@ #!/bin/bash -set -xv -for file in $(find . -type f -iname '*.rst'); do - file_cut="${{file%.*}}" - html_file=$file_cut".html" - pdf_file=$file_cut".pdf" - rst2html $file > $html_file - rst2pdf $file -o $pdf_file +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 + diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index ee3c0267c..9c1ca084a 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -147,15 +147,6 @@ builders: - shell: !include-raw build-docu.sh - - shell: | - /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/ - /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/ - /usr/local/bin/gsutil cp docs/release/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/release/ - /usr/local/bin/gsutil cp docs/release/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/release/ - /usr/local/bin/gsutil cp requirements/*.pdf gs://artifacts.opnfv.org/opnfvdocs/requirements/ - /usr/local/bin/gsutil cp requirements/*.html gs://artifacts.opnfv.org/opnfvdocs/requirements/ - /usr/local/bin/gsutil cp design_docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/design_docs/ - /usr/local/bin/gsutil cp design_docs/*.html gs://artifacts.opnfv.org/opnfvdocs/design_docs/ postbuilders: - test-macro @@ -256,13 +247,4 @@ builders: - shell: !include-raw build-docu.sh - - shell: | - /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/ - /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/ - /usr/local/bin/gsutil cp docs/release/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/release/ - /usr/local/bin/gsutil cp docs/release/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/release/ - /usr/local/bin/gsutil cp requirements/*.pdf gs://artifacts.opnfv.org/opnfvdocs/requirements/ - /usr/local/bin/gsutil cp requirements/*.html gs://artifacts.opnfv.org/opnfvdocs/requirements/ - /usr/local/bin/gsutil cp design_docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/design_docs/ - /usr/local/bin/gsutil cp design_docs/*.html gs://artifacts.opnfv.org/opnfvdocs/design_docs/ diff --git a/jjb/octopus/build-docu.sh b/jjb/octopus/build-docu.sh index 5978653d0..81f875dcf 100644 --- a/jjb/octopus/build-docu.sh +++ b/jjb/octopus/build-docu.sh @@ -1,9 +1,42 @@ #!/bin/bash -set -xv -for file in $(find . -type f -iname '*.rst'); do - file_cut="${{file%.*}}" - html_file=$file_cut".html" - pdf_file=$file_cut".pdf" - rst2html $file > $html_file - rst2pdf $file -o $pdf_file +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 + diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index efd9a2214..923696eb6 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -75,10 +75,6 @@ builders: - shell: !include-raw build-docu.sh - - shell: | - /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/ - /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/ - postbuilders: - test-macro @@ -181,9 +177,4 @@ builders: - shell: !include-raw build-docu.sh - - shell: | - /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/ - /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/ - - diff --git a/jjb/opnfvdocs/build-docu.sh b/jjb/opnfvdocs/build-docu.sh index 832297d3e..b7437265d 100644 --- a/jjb/opnfvdocs/build-docu.sh +++ b/jjb/opnfvdocs/build-docu.sh @@ -2,41 +2,41 @@ project="opnfvdocs" export PATH=$PATH:/usr/local/bin/ -git_sha1="git rev-parse HEAD" -git_date="date" +git_sha1="$(git rev-parse HEAD)" +docu_build_date="$(date)" files=() while read -r -d ''; do - files+=("$REPLY") + 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_/$git_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 + 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 diff --git a/jjb/pharos/build-docu.sh b/jjb/pharos/build-docu.sh index ca9ecd0d3..caf102119 100644 --- a/jjb/pharos/build-docu.sh +++ b/jjb/pharos/build-docu.sh @@ -1,9 +1,42 @@ #!/bin/bash -set -xv -for file in $(find . -type f -iname '*.rst'); do - file_cut="${{file%.*}}" - html_file=$file_cut".html" - pdf_file=$file_cut".pdf" - rst2html $file > $html_file - rst2pdf $file -o $pdf_file +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 + diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index c87532342..004ea8cd1 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -71,16 +71,6 @@ builders: - shell: !include-raw build-docu.sh - - shell: | - /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/ - /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/ - /usr/local/bin/gsutil cp docs/release/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/release/ - /usr/local/bin/gsutil cp docs/release/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/release/ - /usr/local/bin/gsutil cp requirements/*.pdf gs://artifacts.opnfv.org/opnfvdocs/requirements/ - /usr/local/bin/gsutil cp requirements/*.html gs://artifacts.opnfv.org/opnfvdocs/requirements/ - /usr/local/bin/gsutil cp design_docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/design_docs/ - /usr/local/bin/gsutil cp design_docs/*.html gs://artifacts.opnfv.org/opnfvdocs/design_docs/ - postbuilders: - test-macro @@ -181,14 +171,4 @@ builders: - shell: !include-raw build-docu.sh - - shell: | - /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/ - /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/ - /usr/local/bin/gsutil cp docs/release/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/release/ - /usr/local/bin/gsutil cp docs/release/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/release/ - /usr/local/bin/gsutil cp requirements/*.pdf gs://artifacts.opnfv.org/opnfvdocs/requirements/ - /usr/local/bin/gsutil cp requirements/*.html gs://artifacts.opnfv.org/opnfvdocs/requirements/ - /usr/local/bin/gsutil cp design_docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/design_docs/ - /usr/local/bin/gsutil cp design_docs/*.html gs://artifacts.opnfv.org/opnfvdocs/design_docs/ - |