X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbarometer%2Fbarometer.yml;h=2d3e972f86ed62b7b3f93237ca04d0765d7c68bb;hb=0b1265b850471397d413b80c94e5e48cf38b637b;hp=4afe40e387cb25a6b485ebadbc6b3fbb0c3efea5;hpb=92e6e549dcab1777ebcc7c888e99c52f0dfdf433;p=releng.git

diff --git a/jjb/barometer/barometer.yml b/jjb/barometer/barometer.yml
index 4afe40e38..2d3e972f8 100644
--- a/jjb/barometer/barometer.yml
+++ b/jjb/barometer/barometer.yml
@@ -17,7 +17,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
@@ -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'
@@ -77,6 +77,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 3
@@ -86,7 +87,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -106,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/**'
@@ -114,9 +115,8 @@
         - shell: |
             pwd
             cd src
-            ./install_build_deps.sh
-            sudo make clobber
-            sudo make
+            make clobber
+            make
 
 - job-template:
     name: 'barometer-daily-{stream}'
@@ -125,21 +125,18 @@
 
     disabled: '{obj:disabled}'
 
-    concurrent: true
+    concurrent: false
 
     properties:
-        - throttle:
-            enabled: true
-            max-total: 3
-            max-per-node: 2
-            option: 'project'
+        - logrotate-default
 
     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
@@ -148,9 +145,18 @@
          - timed: '@midnight'
 
     builders:
-        - shell: |
-            pwd
-            cd src
-            ./install_build_deps.sh
-            sudo make clobber
-            sudo 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."