Configured artifacts publish daily & on merge for projects with documentation

JIRA: DOCS-2 - artifacts publish daily & on merge for the following projects:
opnfvdocs, octopus, genesis, functest, pharos

Change-Id: Id055d8e955e1c55c6b18a5bdf28d940ef7d53729
Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index be7f689..b16d071 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -10,7 +10,6 @@
         - 'functest-daily-{stream}'
         - 'functest-merge'
         - 'functest-verify'
-        - 'functest-build-docs'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -146,10 +145,11 @@
         - test-macro
 
     builders:
+        - shell:
+            !include-raw build-docu.sh
         - shell: |
-            pwd
-            find .
-            echo "Hello world from functest {somevar} daily"
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/
 
     postbuilders:
         - test-macro
@@ -200,10 +200,8 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !include-raw build-docu.sh
 
 - job-template:
     name: 'functest-merge'
@@ -214,52 +212,6 @@
 
     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: 'functest'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-
-    builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-- job-template:
-    name: 'functest-build-docs'
-
-    project-type: freestyle
-
     logrotate:
         daysToKeep: 30
         numToKeep: 40
@@ -298,4 +250,8 @@
     builders:
         - shell: 
             !include-raw build-docu.sh
+        - shell: |
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/
+
 

diff --git a/jjb/genesis/genesis-docs.yml b/jjb/genesis/genesis-docs.yml
index aeee562..2e2bd73 100644 (file)
--- a/jjb/genesis/genesis-docs.yml
+++ b/jjb/genesis/genesis-docs.yml
@@ -60,3 +60,7 @@
     builders:
         - shell: 
             !include-raw build-docu.sh
+        - shell: |
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/genesis/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/genesis/docs/
+

diff --git a/jjb/octopus/build-docu.sh b/jjb/octopus/build-docu.sh
index cbbf265..558451d 100644 (file)
--- a/jjb/octopus/build-docu.sh
+++ b/jjb/octopus/build-docu.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -xv
 for file in $(find . -type f -iname '*.rst'); do
          file_cut="${{file%.*}}"
          html_file=$file_cut".html"

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 40b25de..b465537 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -69,10 +69,12 @@
         - test-macro
 
     builders:
+        - shell:
+            !include-raw build-docu.sh
         - shell: |
-            pwd
-            find .
-            echo "Hello world from octopus {somevar} daily"
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/
+
 
     postbuilders:
         - test-macro
@@ -123,10 +125,8 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !include-raw build-docu.sh
 
 - job-template:
     name: 'octopus-merge'
@@ -173,58 +173,11 @@
                       branch-pattern: '**/master'
 
     builders:
+        - shell:
+            !include-raw build-docu.sh
         - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-- job-template:
-     name: 'octopus-build-docs'
-
-     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: 'octopus'
-                 branches:
-                     - branch-compare-type: 'ANT'
-                       branch-pattern: '**/master'
-
-     builders:
-         - shell:
-             !include-raw build-docu.sh
-
-
-
-
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/
 
 
 

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index b717ec6..3789dc3 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -150,3 +150,8 @@
     builders:
         - shell:
             !include-raw build-docu.sh
+        - shell: |
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/
+
+

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 742e536..cee73a4 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -5,7 +5,6 @@
         - 'pharos-daily-{stream}'
         - 'pharos-merge'
         - 'pharos-verify'
-        - 'pharos-build-docs'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -70,10 +69,12 @@
         - test-macro
 
     builders:
+        - shell:
+            !include-raw build-docu.sh
         - shell: |
-            pwd
-            find .
-            echo "Hello world from pharos {somevar} daily"
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/
+
 
     postbuilders:
         - test-macro
@@ -124,10 +125,8 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !include-raw build-docu.sh
 
 - job-template:
     name: 'pharos-merge'
@@ -174,54 +173,11 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-- job-template:
-    name: 'pharos-build-docs'
-
-    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: 'pharos'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-
-    builders:
-        - shell: 
+        - shell:
             !include-raw build-docu.sh
+        - shell: |
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/