Use pod-params and installer-params for yardstick

[releng.git] / jjb / vswitchperf / vswitchperf.yml

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 0293038..b4bc70f 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -1,10 +1,9 @@
 - project:
     name: vswitchperf
     jobs:
-        - 'vswitchperf-test'
-        - 'vswitchperf-daily-master'
-        - 'vswitchperf-merge'
-        - 'vswitchperf-verify'
+        - 'vswitchperf-daily-{stream}'
+        - 'vswitchperf-merge-{stream}'
+        - 'vswitchperf-verify-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -16,22 +15,7 @@
     somevar: 'foo'
 
 - 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-master'
+    name: 'vswitchperf-daily-{stream}'
 
     # Job template for daily builders
     #
@@ -39,19 +23,15 @@
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
 
-    project-type: freestyle
     varsetabove: '{somevar}'
-    node: fuel
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    node: opnfv-build
 
     parameters:
         - project-parameter:
             project: '{project}'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/vswitchperf
 
     scm:
         - git-scm:
@@ -59,10 +39,6 @@
             refspec: ''
             branch: '{branch}'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - timed: 'H H * * *'
 
@@ -73,6 +49,7 @@
         - shell: |
             pwd
             cd src
+            make clobber
             make
             # run basic sanity test
             make sanity
@@ -81,32 +58,34 @@
         - test-macro
 
 - job-template:
-    name: 'vswitchperf-verify'
+    name: 'vswitchperf-verify-{stream}'
 
     project-type: freestyle
-    node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    node: opnfv-build
+
+    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
     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:
@@ -125,36 +104,46 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/master'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
 
     builders:
         - shell: |
             pwd
             cd src
+            make clobber
             make
             # run basic sanity test
             make sanity
 
 - job-template:
-    name: 'vswitchperf-merge'
+    name: 'vswitchperf-merge-{stream}'
 
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
 
     project-type: freestyle
-    node: fuel
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    node: opnfv-build
+
+    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
 
     scm:
         - gerrit-trigger-scm:
@@ -162,10 +151,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -178,9 +163,13 @@
                 branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/master'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
 
     builders:
         - shell: |
             pwd
             cd src
+            make clobber
             make