X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fvswitchperf%2Fvswitchperf.yml;h=cda5128e22d6fdc9d361ea0d68681ba424705122;hb=cc8c74caed5b1e767f351bbb83adc53d0b3b00fd;hp=a7b78d1ab4c70e41d1b0b50bd1982422ffc8a869;hpb=1f175b394903621761454afa49e4cd942b9a5948;p=releng.git

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index a7b78d1ab..cda5128e2 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -1,43 +1,36 @@
 - project:
+
     name: vswitchperf
+
+    project: '{name}'
+
     jobs:
-        - 'vswitchperf-daily-{stream}'
-        - 'vswitchperf-merge-{stream}'
         - 'vswitchperf-verify-{stream}'
+        - 'vswitchperf-merge-{stream}'
+        - 'vswitchperf-daily-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
     stream:
         - master:
-            branch: 'master'
-
-    project: 'vswitchperf'
-    somevar: 'foo'
+            branch: '{stream}'
+            gs-pathname: ''
+            disabled: false
+            slave-label: 'opnfv-build-ubuntu'
+        - colorado:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
+            slave-label: 'intel-pod3'
 
 - job-template:
-    name: 'vswitchperf-daily-{stream}'
 
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-
-    varsetabove: '{somevar}'
-    node: opnfv-build
+    name: 'vswitchperf-daily-{stream}'
 
-    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}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/vswitchperf
+        - 'intel-pod3-defaults'
 
     scm:
         - git-scm:
@@ -46,10 +39,8 @@
             branch: '{branch}'
 
     triggers:
-        - timed: 'H H * * *'
-
-    prebuilders:
-        - test-macro
+        - pollscm:
+            cron: '@midnight'
 
     builders:
         - shell: |
@@ -59,39 +50,33 @@
             make
             # run basic sanity test
             make sanity
-
-    postbuilders:
-        - test-macro
+            cd ../ci
+            scl enable python33 "source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily"
 
 - job-template:
     name: 'vswitchperf-verify-{stream}'
 
-    project-type: freestyle
+    disabled: '{obj:disabled}'
 
-    node: opnfv-build
+    project-type: freestyle
 
     concurrent: true
 
     properties:
-        - throttle:
-            enabled: true
-            max-total: 3
-            max-per-node: 2
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'vswitchperf-verify-.*'
+                - 'vswitchperf-merge-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/vswitchperf
+            branch: '{branch}'
+        - '{slave-label}-defaults'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -100,6 +85,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -112,10 +98,10 @@
                     comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'vswitchperf'
+                project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
@@ -128,40 +114,32 @@
             make
             # run basic sanity test
             make sanity
+            cd ../ci
+            ./build-vsperf.sh verify
 
 - job-template:
     name: 'vswitchperf-merge-{stream}'
 
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
+    disabled: '{obj:disabled}'
 
     project-type: freestyle
 
-    node: opnfv-build
-
     concurrent: true
 
     properties:
-        - throttle:
-            enabled: true
-            max-total: 3
-            max-per-node: 2
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'vswitchperf-verify-.*'
+                - 'vswitchperf-merge-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/vswitchperf
+            branch: '{branch}'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -171,16 +149,17 @@
 
     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: 'vswitchperf'
+                project-pattern: '{project}'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
@@ -191,3 +170,5 @@
             cd src
             make clobber
             make
+            cd ../ci
+            ./build-vsperf.sh merge