From f816e4df224080830f025b665670071843cb8f7f Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Tue, 21 Nov 2017 10:54:07 +0000 Subject: [PATCH] vswitchperf: Use POD12 for VERIFY and MERGE jobs In the past, vswitchperf's VERIFY & MERGE jobs were executed at ericsson-build3 & build4 machines. However VPP sometimes refuses to start properly and it is hard to debug root cause without access to these servers. Thus description of VERIFY & MERGE jobs was changed to run them by default at POD12, which is dedicated to vswitchperf project. In case that daily job is active, then VERIFY & MERGE jobs will be executed at ericsson-build4 as before. Execution of "make sanity" was removed, because this target is a "stub" in vsperf makefile. Change-Id: Iec0f788ab28425d0999811ceb5236e097cee2ff4 Signed-off-by: Martin Klozik Reviewed-by: Fatih Degirmenci Reviewed-by: Trevor Bramwell --- jjb/vswitchperf/vswitchperf.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 16ceb2e52..9a0fb10c8 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -26,6 +26,16 @@ disabled: '{obj:disabled}' + properties: + - logrotate-default + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'vswitchperf-verify-.*' + - 'vswitchperf-merge-.*' + - 'vswitchperf-daily-.*' + block-level: 'NODE' + parameters: - project-parameter: project: '{project}' @@ -45,8 +55,6 @@ cd src make clobber make MORE_MAKE_FLAGS="-j 10" - # run basic sanity test - make sanity cd ../ci scl enable python33 "source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily" @@ -66,6 +74,7 @@ blocking-jobs: - 'vswitchperf-verify-.*' - 'vswitchperf-merge-.*' + - 'vswitchperf-daily-.*' block-level: 'NODE' parameters: @@ -80,8 +89,10 @@ name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: + - intel-pod12 - ericsson-build4 default-slaves: + - intel-pod12 - ericsson-build4 scm: @@ -117,8 +128,6 @@ cd src make clobber make MORE_MAKE_FLAGS="-j 5" - # run basic sanity test - make sanity cd ../ci ./build-vsperf.sh verify @@ -138,6 +147,7 @@ blocking-jobs: - 'vswitchperf-verify-.*' - 'vswitchperf-merge-.*' + - 'vswitchperf-daily-.*' block-level: 'NODE' parameters: @@ -152,8 +162,10 @@ name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: + - intel-pod12 - ericsson-build4 default-slaves: + - intel-pod12 - ericsson-build4 scm: -- 2.16.6