summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-04-13 10:16:13 -0500
committerThanh Ha <thanh.ha@linuxfoundation.org>2016-04-13 11:35:23 -0400
commited6e18ad2b07bd794695a3beea918dd9e8b6c75b (patch)
tree8326e0476e26b4185d6eeda883b45ae45e53a1d1
parent5723b3d8df4cdd73489e7cad678beea3c628d6bc (diff)
Fix virl scripts broken by {os}
Change-Id: I9f16666cf18753ce47d74fa21c125b1375407ecf Signed-off-by: Ed Warnicke <eaw@cisco.com> Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
-rw-r--r--jjb/vpp/vpp.yaml22
1 files changed, 18 insertions, 4 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 1d046d6af..fb3bfd01b 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -3,8 +3,6 @@
jobs:
- 'vpp-verify-{branch}-{os}'
- 'vpp-merge-{branch}-{os}'
- - 'vpp-csit-verify-virl'
- - 'vpp-verify-performance-{type}'
project: 'vpp'
os:
@@ -15,6 +13,18 @@
- short
- long
+- project:
+ name: vpp-misc
+ jobs:
+ - 'vpp-csit-verify-virl'
+ - 'vpp-verify-performance-{type}'
+ project: 'vpp'
+ branch: 'master'
+ os: ubuntu1404
+ type:
+ - short
+ - long
+
- job-template:
name: 'vpp-verify-{branch}-{os}'
@@ -113,7 +123,7 @@
name: 'vpp-csit-verify-virl'
project-type: freestyle
- node: verify
+ node: 'verify-{os}'
concurrent: true
logrotate:
@@ -127,6 +137,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - os-parameter:
+ os: '{os}'
scm:
- gerrit-trigger-scm:
@@ -162,7 +174,7 @@
name: 'vpp-verify-performance-{type}'
project-type: freestyle
- node: verify
+ node: 'verify-{os}'
concurrent: false
logrotate:
@@ -176,6 +188,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - os-parameter:
+ os: '{os}'
- type-parameter:
type: '{type}'