X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fvswitchperf%2Fvswitchperf.yml;h=3344e187ea7cea1f18d7cf4176f8bf317de04101;hb=382b9a9d05ab70ff995a7f862089e0a5f911fbf9;hp=07ce11414871647424335beadbc73ff6483feaeb;hpb=fd27b7a9543e430602b7e2fca339b1f84a189142;p=releng.git

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 07ce11414..3344e187e 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -1,60 +1,31 @@
 - project:
+
     name: vswitchperf
+
+    project: '{name}'
+
     jobs:
-        - 'vswitchperf-test'
+        - 'vswitchperf-verify-{stream}'
+        - 'vswitchperf-merge-{stream}'
         - 'vswitchperf-daily-{stream}'
-        - 'vswitchperf-merge'
-        - 'vswitchperf-verify'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: 'master'
-
-    project: 'vswitchperf'
-    somevar: 'foo'
+            gs-pathname: ''
+#        - brahmaputra:
+#            branch: 'stable/brahmaputra'
+#            gs-pathname: '/brahmaputra'
 
 - job-template:
-    name: vswitchperf-test
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
 
-    builders:
-        - shell: |
-            echo "Hello world from vswitchperf"
-
-- 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)
-
-    project-type: freestyle
-    varsetabove: '{somevar}'
-    node: ericsson-build
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
     parameters:
         - project-parameter:
             project: '{project}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/vswitchperf
+        - 'intel-pod3-defaults'
 
     scm:
         - git-scm:
@@ -62,15 +33,8 @@
             refspec: ''
             branch: '{branch}'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
-        - timed: 'H H * * *'
-
-    prebuilders:
-        - test-macro
+        - pollscm: '@midnight'
 
     builders:
         - shell: |
@@ -80,40 +44,37 @@
             make
             # run basic sanity test
             make sanity
-
-    postbuilders:
-        - test-macro
+            scl enable python33 bash
+            source ~/vsperfenv/bin/activate
+            cd ../ci
+            ./build-vsperf.sh daily
 
 - job-template:
-    name: 'vswitchperf-verify'
+    name: 'vswitchperf-verify-{stream}'
 
     project-type: freestyle
-    node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+            max-per-node: 2
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/vswitchperf
+            branch: '{branch}'
+        - 'opnfv-build-defaults'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -128,10 +89,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/**'
@@ -146,29 +107,24 @@
             make sanity
 
 - job-template:
-    name: 'vswitchperf-merge'
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
+    name: 'vswitchperf-merge-{stream}'
 
     project-type: freestyle
-    node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+            max-per-node: 2
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/vswitchperf
+            branch: '{branch}'
+        - 'opnfv-build-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -176,10 +132,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -188,10 +140,10 @@
                     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/**'