jjb: move ssh wrappers to releng-defaults.yaml

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

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 192737b..9f767ce 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -1,10 +1,9 @@
 - project:
     name: vswitchperf
     jobs:
-        - 'vswitchperf-test'
         - 'vswitchperf-daily-{stream}'
-        - 'vswitchperf-merge'
-        - 'vswitchperf-verify'
+        - 'vswitchperf-merge-{stream}'
+        - 'vswitchperf-verify-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -15,20 +14,6 @@
     project: 'vswitchperf'
     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-{stream}'
@@ -41,7 +26,7 @@
 
     project-type: freestyle
     varsetabove: '{somevar}'
-    node: ericsson-build
+    node: opnfv-build
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -62,10 +47,6 @@
             refspec: ''
             branch: '{branch}'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - timed: 'H H * * *'
 
@@ -76,6 +57,7 @@
         - shell: |
             pwd
             cd src
+            make clobber
             make
             # run basic sanity test
             make sanity
@@ -84,10 +66,19 @@
         - test-macro
 
 - job-template:
-    name: 'vswitchperf-verify'
+    name: 'vswitchperf-verify-{stream}'
 
     project-type: freestyle
-    node: ericsson-build
+
+    node: opnfv-build
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+            max-per-node: 2
 
     logrotate:
         daysToKeep: 30
@@ -109,10 +100,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -131,24 +118,37 @@
                 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: ericsson-build
+
+    node: opnfv-build
+
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 3
+            max-per-node: 2
 
     logrotate:
         daysToKeep: 30
@@ -171,10 +171,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -187,9 +183,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