add the daily/merge jobs and remove docu-build scripts to use SPHINX

JIRA: BOTTLENECK-1

to use the SPHINX, the build script is in releng/utils/docu-build-new.sh, should move all docs to /$project/docs directory

Change-Id: I5f1b538261017734570c9b21954555cb551af060
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

2 files changed, 104 insertions, 88 deletions

diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index 0baf7ba31..c55d6cc4c 100644
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -6,6 +6,8 @@
     jobs:
         - 'bottlenecks-test'
         - 'bottlenecks-verify'
+        - 'bottlenecks-daily-{stream}'
+        - 'bottlenecks-merge'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -15,11 +17,9 @@
 
     project: 'bottlenecks'
     somevar: 'foo'
-
-########################
-# job templates
-########################
-
+###############################
+# Job templates
+##############################
 - job-template:
     name: 'bottlenecks-test'
 
@@ -35,6 +35,52 @@
         - shell: |
             echo "Hello world from bottlenecks"
 
+- job-template:
+    name: 'bottlenecks-daily-{stream}'
+
+    node: master
+
+    # Job template for daily builders
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+    #     branch:    branch (eg. stable)
+
+    project-type: freestyle
+    varsetabove: '{somevar}'
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    prebuilders:
+        - test-macro
+
+    builders:
+        - shell: |
+            echo "hello world"
+
+    postbuilders:
+        - test-macro
 
 - job-template:
     name: 'bottlenecks-verify'
@@ -54,7 +100,6 @@
             project: '{project}'
         - gerrit-parameter:
             branch: 'master'
-
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -85,5 +130,56 @@
                     branch-pattern: '**/master'
 
     builders:
-       - shell:
-            !include-raw docu-build.sh
+        - shell: |
+            echo "hello world"
+
+- job-template:
+    name: 'bottlenecks-merge'
+
+    node: master
+
+    # builder-merge job to run JJB update
+    #
+    # This job's purpose is to update all the JJB
+
+    project-type: freestyle
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 40
+        artifactDaysToKeep: -1
+        artifactNumToKeep: 5
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: 'master'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'bottlenecks'
+                branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/master'
+
+    builders:
+        - shell: |
+            echo "hello world"
+
diff --git a/jjb/bottlenecks/docu-build.sh b/jjb/bottlenecks/docu-build.sh
deleted file mode 100644
index c56069271..000000000
--- a/jjb/bottlenecks/docu-build.sh
+++ /dev/null
@@ -1,80 +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)"
-
-if [[ $JOB_NAME =~ "verify" ]] ; then
-      subdir="/$GERRIT_CHANGE_NUMBER"
-fi
-
-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""$subdir"/"$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""$subdir"/"$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""$subdir"/"$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""$subdir"/"$gs_cp_folder".pdf
-	cat gsoutput.txt
-	rm -f gsoutput.txt
-
-  links+="http://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".html \n"
-  links+="http://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".pdf \n"
-
-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""$subdir"/"$img"
-        gsutil setmeta -h "Content-Type:image/jpeg" \
-                        -h "Cache-Control:private, max-age=0, no-transform" \
-                        gs://artifacts.opnfv.org/"$project""$subdir"/"$img"
-        cat gsoutput.txt
-        rm -f gsoutput.txt
-
-done
-
-if [[ $GERRIT_EVENT_TYPE = "change-merged" ]] ; then
-    subdir="/$GERRIT_CHANGE_NUMBER"
-    if [ ! -z "$subdir" ]; then
-      gsutil rm gs://artifacts.opnfv.org/"$project""$subdir"/** || true
-    fi
-fi
-
-echo -e "$links"
-