Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Rectify inter-job blocking strategy"
[releng.git]
/
jjb
/
bottlenecks
/
bottlenecks-project-jobs.yml
diff --git
a/jjb/bottlenecks/bottlenecks-project-jobs.yml
b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index
51782a2
..
5dced2a
100644
(file)
--- a/
jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/
jjb/bottlenecks/bottlenecks-project-jobs.yml
@@
-20,7
+20,7
@@
#This is used for different test suite dependent packages storage
gs-packagepath: '/{suite}'
disabled: false
#This is used for different test suite dependent packages storage
gs-packagepath: '/{suite}'
disabled: false
- -
colorado
:
+ -
danube
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
gs-packagepath: '/{stream}/{suite}'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
gs-packagepath: '/{stream}/{suite}'
@@
-29,6
+29,8
@@
suite:
- 'rubbos'
- 'vstf'
suite:
- 'rubbos'
- 'vstf'
+ - 'posca_stress_traffic'
+ - 'posca_stress_ping'
################################
# job templates
################################
# job templates
@@
-42,18
+44,15
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
scm:
branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
+ - git-scm-gerrit
triggers:
- gerrit:
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'
@@
-71,6
+70,7
@@
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
builders:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
builders:
+ #- bottlenecks-hello
- bottlenecks-unit-tests
- job-template:
- bottlenecks-unit-tests
- job-template:
@@
-81,18
+81,15
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
scm:
branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
+ - git-scm
triggers:
- gerrit:
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- change-merged-event
- comment-added-contains-event:
trigger-on:
- change-merged-event
- comment-added-contains-event:
@@
-105,7
+102,8
@@
branch-pattern: '**/{branch}'
builders:
branch-pattern: '**/{branch}'
builders:
- - bottlenecks-unit-tests
+ - bottlenecks-hello
+ #- bottlenecks-unit-tests
- job-template:
name: 'bottlenecks-{suite}-upload-artifacts-{stream}'
- job-template:
name: 'bottlenecks-{suite}-upload-artifacts-{stream}'
@@
-116,6
+114,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-total: 1
- throttle:
enabled: true
max-total: 1
@@
-125,15
+124,13
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
- bottlenecks-parameter:
gs-packagepath: '{gs-packagepath}'
scm:
- 'opnfv-build-ubuntu-defaults'
- bottlenecks-parameter:
gs-packagepath: '{gs-packagepath}'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
builders:
- 'bottlenecks-builder-upload-artifact'
builders:
- 'bottlenecks-builder-upload-artifact'
@@
-209,9
+206,18
@@
# install python packages
easy_install -U setuptools
easy_install -U pip
# install python packages
easy_install -U setuptools
easy_install -U pip
- pip install -r
requirements
.txt
+ pip install -r
$WORKSPACE/requirements/verify
.txt
# unit tests
# unit tests
- /bin/bash $WORKSPACE/
tests
.sh
+ /bin/bash $WORKSPACE/
verify
.sh
deactivate
deactivate
+
+- builder:
+ name: bottlenecks-hello
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -o errexit
+
+ echo -e "Wellcome to Bottlenecks! \nMerge event is planning to support more functions! "