Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move storperf jobs to intel-jp-build-1 slave
[releng.git]
/
jjb
/
storperf
/
storperf.yml
diff --git
a/jjb/storperf/storperf.yml
b/jjb/storperf/storperf.yml
index
595c663
..
1d50911
100644
(file)
--- a/
jjb/storperf/storperf.yml
+++ b/
jjb/storperf/storperf.yml
@@
-1,8
+1,8
@@
- project:
name: storperf
jobs:
- project:
name: storperf
jobs:
- - 'storperf-verify'
- - 'storperf-merge'
+ - 'storperf-verify
-{stream}
'
+ - 'storperf-merge
-{stream}
'
- 'storperf-daily-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
- 'storperf-daily-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
@@
-14,9
+14,9
@@
project: 'storperf'
- job-template:
project: 'storperf'
- job-template:
- name: 'storperf-verify'
+ name: 'storperf-verify
-{stream}
'
- node:
master
+ node:
intel-jp-build-1
project-type: freestyle
project-type: freestyle
@@
-31,6
+31,10
@@
project: '{project}'
- gerrit-parameter:
branch: 'master'
project: '{project}'
- gerrit-parameter:
branch: 'master'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-62,17
+66,18
@@
branch-pattern: '**/master'
builders:
branch-pattern: '**/master'
builders:
- - shell:
- echo "Hello World"
+ - shell: |
+ $WORKSPACE/ci/verify.sh
+
- job-template:
- job-template:
- name: 'storperf-merge'
+ name: 'storperf-merge
-{stream}
'
# builder-merge job to run JJB update
#
# This job's purpose is to update all the JJB
# builder-merge job to run JJB update
#
# This job's purpose is to update all the JJB
- node:
master
+ node:
intel-jp-build-1
project-type: freestyle
project-type: freestyle
@@
-87,6
+92,10
@@
project: '{project}'
- gerrit-parameter:
branch: 'master'
project: '{project}'
- gerrit-parameter:
branch: 'master'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-112,8
+121,12
@@
branch-pattern: '**/master'
builders:
branch-pattern: '**/master'
builders:
- - shell:
- echo "Hello World"
+ - shell: |
+ $WORKSPACE/ci/merge.sh
+
+ publishers:
+ - junit:
+ results: nosetests.xml
- job-template:
- job-template:
@@
-124,7
+137,7
@@
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node:
master
+ node:
intel-jp-build-1
disabled: true
disabled: true
@@
-154,5
+167,6
@@
- timed: 'H H * * *'
builders:
- timed: 'H H * * *'
builders:
- - shell:
- echo "Hello World"
+ - shell: |
+ $WORKSPACE/ci/daily.sh
+