X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffastpathmetrics%2Ffastpathmetrics.yml;h=6be6a52c3ba5ea18c7cb4b6331712cbda97bce36;hb=8ea5b3a2e506ef3bbae983c0b2d5b13b3a22e768;hp=6004874dc9dfc341a2965c1cb5c7e4898bd686e2;hpb=9c49c98cb5fcd4f5f0df40f09853b919c85c38da;p=releng.git

diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml
index 6004874dc..6be6a52c3 100644
--- a/jjb/fastpathmetrics/fastpathmetrics.yml
+++ b/jjb/fastpathmetrics/fastpathmetrics.yml
@@ -1,89 +1,39 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
 - project:
     name: fastpathmetrics
+
+    project: '{name}'
+
     jobs:
-        - 'fastpathmetrics-test'
+        - 'fastpathmetrics-verify-{stream}'
+        - 'fastpathmetrics-merge-{stream}'
         - 'fastpathmetrics-daily-{stream}'
-        - 'fastpathmetrics-merge'
-        - 'fastpathmetrics-verify'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
     stream:
         - master:
-            branch: 'master'
-
-    project: 'fastpathmetrics'
-    somevar: 'foo'
+            branch: '{stream}'
+            gs-pathname: ''
+            disabled: false
+        - colorado:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
 
 - job-template:
-    name: fastpathmetrics-test
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    name: 'fastpathmetrics-verify-{stream}'
 
-    builders:
-        - shell: |
-            echo "Hello world from fastpathmetrics"
-
-- job-template:
-    name: 'fastpathmetrics-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-
-    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}'
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: '{project}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
+        - gerrit-parameter:
             branch: '{branch}'
+        - 'opnfv-build-ubuntu-defaults'
 
-    triggers:
-        - timed: 'H H * * *'
-
-    prebuilders:
-        - test-macro
-
-    builders:
-        - shell: |
-            pwd
-            find .
-            echo "Hello world from fastpathmetrics {somevar} daily"
-
-    postbuilders:
-        - test-macro
-
-- job-template:
-    name: 'fastpathmetrics-verify'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -92,6 +42,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -104,35 +55,43 @@
                     comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'fastpathmetrics'
+                project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**|.gitignore'
 
     builders:
         - shell: |
             pwd
-            find .
-            echo "verify logic goes here"
+            cd src
+            make clobber
+            make
 
 - job-template:
-    name: 'fastpathmetrics-merge'
+    name: 'fastpathmetrics-merge-{stream}'
+
+    project-type: freestyle
+
+    disabled: '{obj:disabled}'
 
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
+    concurrent: true
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+            max-per-node: 2
+            option: 'project'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -142,20 +101,63 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
                     comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'fastpathmetrics'
+                project-pattern: '{project}'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
 
     builders:
         - shell: |
             pwd
-            find .
-            echo "merge logic goes here"
+            cd src
+            make clobber
+            make
+
+- job-template:
+    name: 'fastpathmetrics-daily-{stream}'
 
+    project-type: freestyle
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+            max-per-node: 2
+            option: 'project'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - 'opnfv-build-ubuntu-defaults'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    triggers:
+         - timed: '@midnight'
+
+    builders:
+        - shell: |
+            pwd
+            cd src
+            make clobber
+            make