diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-02-12 07:56:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-12 07:56:01 +0000 |
| commit | ed07f0df576cd775acc9b14ef4356732a109d82b (patch) | |
| tree | aa4a54df52de9a20a9412e268c8cff3d7e55fac6 /jjb/vswitchperf | |
| parent | 36c14723267e81a7f0f0e35232436566872789d8 (diff) | |
| parent | f816e4df224080830f025b665670071843cb8f7f (diff) | |
Merge "vswitchperf: Use POD12 for VERIFY and MERGE jobs"
Diffstat (limited to 'jjb/vswitchperf')
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 1ceb105d2..7fd875bcb 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 rh-python34 "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: |