X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpharos%2Fpharos.yml;h=92890df1e0393c5f86a5e6498c94dfc0e3ca73c1;hb=a8f7054c6691852c58c0fd68961a4302c101e20c;hp=6fcd11b9427187f005f40da28812901daae7a494;hpb=a85c651868c92fc41d2f6149f02981c3b22e7577;p=releng.git

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 6fcd11b94..92890df1e 100644
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -4,18 +4,20 @@
 - project:
     name: pharos
     jobs:
-        - 'pharos-test'
-        - 'pharos-daily-master'
-        - 'pharos-merge'
+        - 'pharos-daily-{stream}'
+        - 'pharos-merge-{stream}'
         - 'pharos-verify-{stream}'
+        - 'pharos-maas-pilot-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
         - stable-arno:
             branch: 'stable/arno'
+            gs-pathname: '/arno'
 
     project: 'pharos'
     somevar: 'foo'
@@ -23,24 +25,7 @@
 # job template
 ##############################
 - job-template:
-    name: pharos-test
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - shell: |
-            echo "Hello world from pharos"
-
-- job-template:
-    name: 'pharos-daily-master'
-
-    node: master
+    name: 'pharos-daily-{stream}'
 
     # Job template for daily builders
     #
@@ -48,38 +33,29 @@
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
 
-    project-type: freestyle
     varsetabove: '{somevar}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
     parameters:
         - project-parameter:
             project: '{project}'
+        - pharos-parameter:
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            branch: '{branch}'
 
     triggers:
-        - timed: 'H H * * *'
+        - 'pharos-{stream}'
 
     prebuilders:
         - test-macro
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
     postbuilders:
         - test-macro
@@ -87,16 +63,6 @@
 - job-template:
     name: 'pharos-verify-{stream}'
 
-    node: master
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -108,10 +74,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -133,30 +95,20 @@
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
 - job-template:
-    name: 'pharos-merge'
-
-    node: master
+    name: 'pharos-merge-{stream}'
 
     # 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'
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -164,10 +116,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -179,9 +127,51 @@
                 project-pattern: 'pharos'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
+- job-template:
+    name: 'pharos-maas-pilot-{stream}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    triggers:
+       - pollscm: '@midnight'
+
+    builders:
+        - shell:
+            echo "Hello World"
+########################
+# parameter macros
+########################
+- parameter:
+    name: pharos-parameter
+    parameters:
+        - string:
+            name: GS_PATHNAME
+            default: '{gs-pathname}'
+            description: "Version directory where the pharos documents will be stored in gs repository"
+
+########################
+## trigger macros
+#########################
+- trigger:
+    name: 'pharos-master'
+    triggers:
+       - pollscm: "H 6 * * *"
+
+- trigger:
+    name: 'pharos-stable-arno'
+    triggers:
+       - pollscm: "H 18 * * *"