Add a more consistent method of cleanup docker Functest jjob

[releng.git] / jjb / pharos / pharos.yml

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 391180b..c763899 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -5,8 +5,8 @@
     name: pharos
     jobs:
         - 'pharos-test'
-        - 'pharos-daily-master'
-        - 'pharos-merge'
+        - 'pharos-daily-{stream}'
+        - 'pharos-merge-{stream}'
         - 'pharos-verify-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -14,8 +14,10 @@
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
         - stable-arno:
             branch: 'stable/arno'
+            gs-pathname: '/arno'
 
     project: 'pharos'
     somevar: 'foo'
@@ -38,7 +40,7 @@
             echo "Hello world from pharos"
 
 - job-template:
-    name: 'pharos-daily-master'
+    name: 'pharos-daily-{stream}'
 
     node: master
 
@@ -60,26 +62,28 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - pharos-parameter:
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     wrappers:
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
     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
@@ -133,10 +137,10 @@
 
     builders:
         - shell:
-            !include-raw docu-verify.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
 - job-template:
-    name: 'pharos-merge'
+    name: 'pharos-merge-{stream}'
 
     node: master
 
@@ -156,7 +160,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -179,9 +183,32 @@
                 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
 
+########################
+# 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 * * *"