From b0cef438b31fc011f4715c1a768b05f3d0110283 Mon Sep 17 00:00:00 2001 From: selias Date: Thu, 26 Oct 2017 13:20:55 +0200 Subject: [PATCH] Add rls1710 branch to csit-hc2vpp-* jobs Change-Id: I1310111ec35db2c5a48f2722f1feeb1645350b60 Signed-off-by: selias --- jjb/csit/csit-hc2vpp.yaml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml index 7ef5c7408..be3a84cfd 100644 --- a/jjb/csit/csit-hc2vpp.yaml +++ b/jjb/csit/csit-hc2vpp.yaml @@ -2,18 +2,22 @@ name: csit-hc2vpp description: 'jenkins jobs to verify Hc2vpp functional and performance tests.' jobs: - - 'csit-hc2vpp-verify-func-{os}' - - 'csit-hc2vpp-verify-perf' + - 'csit-hc2vpp-verify-func-{stream}-{os}' + - 'csit-hc2vpp-verify-perf-{stream}' project: 'csit' branch: 'master' build-artifact-num-to-keep: 10 - os: - ubuntu1604: repo-os-part: 'ubuntu.xenial.main' + stream: + - master: + branch: 'master' + - '1710': + branch: 'rls1710' - job-template: - name: 'csit-hc2vpp-verify-func-{os}' + name: 'csit-hc2vpp-verify-func-{stream}-{os}' project-type: freestyle node: '{os}-basebuild-4c-4g' @@ -31,7 +35,9 @@ - os-parameter: os: '{os}' - stream-parameter: - stream: 'master' + stream: '{stream}' + - gerrit-parameter: + branch: '{branch}' scm: - gerrit-trigger-scm: @@ -72,7 +78,7 @@ output-path: 'archive' - job-template: - name: 'csit-hc2vpp-verify-perf' + name: 'csit-hc2vpp-verify-perf-{stream}' project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' @@ -90,7 +96,9 @@ - os-parameter: os: '{os}' - stream-parameter: - stream: 'master' + stream: '{stream}' + - gerrit-parameter: + branch: '{branch}' scm: - gerrit-trigger-scm: -- 2.16.6