X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fbarometer%2Fbarometer.yml;h=2d3e972f86ed62b7b3f93237ca04d0765d7c68bb;hb=270d47819058ba5a2b36f71ddfb064e05653abeb;hp=7a5b5e43da78a0e96fccf412667c18dc840598b9;hpb=aa51cedd14432be1bc9a9f6e97ca2abc077ba23f;p=releng.git

diff --git a/jjb/barometer/barometer.yml b/jjb/barometer/barometer.yml
index 7a5b5e43d..2d3e972f8 100644
--- a/jjb/barometer/barometer.yml
+++ b/jjb/barometer/barometer.yml
@@ -20,7 +20,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
 - job-template:
     name: 'barometer-verify-{stream}'
@@ -30,7 +30,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -56,6 +55,7 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                disable-strict-forbidden-file-verification: 'true'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'
@@ -87,7 +87,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -107,6 +106,7 @@
                 branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
+                disable-strict-forbidden-file-verification: 'true'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
@@ -115,7 +115,6 @@
         - shell: |
             pwd
             cd src
-            ./install_build_deps.sh
             make clobber
             make
 
@@ -126,22 +125,18 @@
 
     disabled: '{obj:disabled}'
 
-    concurrent: true
+    concurrent: false
 
     properties:
         - logrotate-default
-        - 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'
+        - barometer-project-parameter:
+            gs-pathname: '{gs-pathname}'
+        - 'opnfv-build-centos-defaults'
 
     scm:
         - git-scm
@@ -150,9 +145,18 @@
          - timed: '@midnight'
 
     builders:
-        - shell: |
-            pwd
-            cd src
-            ./install_build_deps.sh
-            make clobber
-            make
+        - shell:
+            !include-raw-escape: ./barometer-build.sh
+        - shell:
+            !include-raw-escape: ./barometer-upload-artifact.sh
+
+########################
+# parameter macros
+########################
+- parameter:
+    name: barometer-project-parameter
+    parameters:
+        - string:
+            name: GS_URL
+            default: '$GS_BASE{gs-pathname}'
+            description: "URL to Google Storage."