Merge "Add jjb template for Compass BGS track"

diff --git a/jjb/functest/build-docu-verify.sh b/jjb/functest/build-docu-verify.sh
new file mode 100644 (file)
index 0000000..e8f34a7
--- /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-docu.sh
deleted file mode 100644 (file)
index ca9ecd0..0000000
--- a/jjb/functest/build-docu.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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
-done

diff --git a/jjb/functest/build-upload-docu.sh b/jjb/functest/build-upload-docu.sh
new file mode 100644 (file)
index 0000000..bd5abdb
--- /dev/null
+++ b/jjb/functest/build-upload-docu.sh
@@ -0,0 +1,42 @@
+#!/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 | 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 ee3c026..8ef9269 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -146,16 +146,7 @@
 
     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/
+            !include-raw build-upload-docu.sh
 
     postbuilders:
         - test-macro
@@ -207,7 +198,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw build-docu-verify.sh
 
 - job-template:
     name: 'functest-merge'
@@ -255,14 +246,5 @@
 
     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/
+            !include-raw build-upload-docu.sh
 

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index a276974..fca2db8 100644 (file)
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -29,6 +29,13 @@
 
     node: ericsson-build
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -109,6 +116,13 @@
 
     node: ericsson-build
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 2
+
     logrotate:
         daysToKeep: 30
         numToKeep: 40

diff --git a/jjb/octopus/build-docu-verify.sh b/jjb/octopus/build-docu-verify.sh
new file mode 100644 (file)
index 0000000..01338ef
--- /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-docu.sh
deleted file mode 100644 (file)
index 5978653..0000000
--- a/jjb/octopus/build-docu.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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
-done

diff --git a/jjb/octopus/build-upload-docu.sh b/jjb/octopus/build-upload-docu.sh
new file mode 100644 (file)
index 0000000..81f875d
--- /dev/null
+++ b/jjb/octopus/build-upload-docu.sh
@@ -0,0 +1,42 @@
+#!/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 | 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 efd9a22..c72292c 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -74,11 +74,7 @@
 
     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/
-
+            !include-raw build-upload-docu.sh
 
     postbuilders:
         - test-macro
@@ -132,7 +128,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw build-docu-verify.sh
 
 - job-template:
     name: 'octopus-merge'
@@ -180,10 +176,5 @@
 
     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/
-
-
+            !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 (file)
index 0000000..061e46d
--- /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-docu.sh
deleted file mode 100644 (file)
index 832297d..0000000
--- a/jjb/opnfvdocs/build-docu.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-project="opnfvdocs"
-export PATH=$PATH:/usr/local/bin/
-
-git_sha1="git rev-parse HEAD"
-git_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_/$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
-
-done
-

diff --git a/jjb/opnfvdocs/build-upload-docu.sh b/jjb/opnfvdocs/build-upload-docu.sh
new file mode 100644 (file)
index 0000000..b743726
--- /dev/null
+++ b/jjb/opnfvdocs/build-upload-docu.sh
@@ -0,0 +1,42 @@
+#!/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 | 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/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 5325327..2d39452 100644 (file)
--- 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 (file)
index 0000000..46862d9
--- /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-docu.sh
deleted file mode 100644 (file)
index ca9ecd0..0000000
--- a/jjb/pharos/build-docu.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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
-done

diff --git a/jjb/pharos/build-upload-docu.sh b/jjb/pharos/build-upload-docu.sh
new file mode 100644 (file)
index 0000000..caf1021
--- /dev/null
+++ b/jjb/pharos/build-upload-docu.sh
@@ -0,0 +1,42 @@
+#!/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 | 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 c875323..85f03b7 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -70,17 +70,7 @@
 
     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/
-
+            !include-raw build-upload-docu.sh
 
     postbuilders:
         - test-macro
@@ -132,7 +122,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw build-docu-verify.sh
 
 - job-template:
     name: 'pharos-merge'
@@ -180,15 +170,5 @@
 
     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/
-
+            !include-raw build-upload-docu.sh