Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove empty execute shell from functest.yml
[releng.git]
/
jjb
/
doctor
/
doctor.yml
diff --git
a/jjb/doctor/doctor.yml
b/jjb/doctor/doctor.yml
index
9bcf20b
..
39c20dc
100644
(file)
--- a/
jjb/doctor/doctor.yml
+++ b/
jjb/doctor/doctor.yml
@@
-2,7
+2,7
@@
name: doctor
jobs:
- 'doctor-test'
name: doctor
jobs:
- 'doctor-test'
- - 'doctor-daily-
master
'
+ - 'doctor-daily-
{stream}
'
- 'doctor-merge'
- 'doctor-verify'
- 'doctor-merge'
- 'doctor-verify'
@@
-18,6
+18,8
@@
- job-template:
name: doctor-test
- job-template:
name: doctor-test
+ node: master
+
project-type: freestyle
logrotate:
project-type: freestyle
logrotate:
@@
-31,7
+33,9
@@
echo "Hello world from doctor"
- job-template:
echo "Hello world from doctor"
- job-template:
- name: 'doctor-daily-master'
+ name: 'doctor-daily-{stream}'
+
+ node: master
# Job template for daily builders
#
# Job template for daily builders
#
@@
-51,6
+55,10
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ - 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:
- git-scm:
scm:
- git-scm:
@@
-69,10
+77,8
@@
- test-macro
builders:
- test-macro
builders:
- - shell: |
- pwd
- find .
- echo "Hello world from doctor {somevar} daily"
+ - shell:
+ !include-raw docu-build.sh
postbuilders:
- test-macro
postbuilders:
- test-macro
@@
-80,6
+86,8
@@
- job-template:
name: 'doctor-verify'
- job-template:
name: 'doctor-verify'
+ node: master
+
project-type: freestyle
logrotate:
project-type: freestyle
logrotate:
@@
-93,6
+101,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:
credentials-id: '{ssh-credentials}'
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@
-123,14
+135,14
@@
branch-pattern: '**/master'
builders:
branch-pattern: '**/master'
builders:
- - shell: |
- pwd
- find .
- echo "verify logic goes here"
+ - shell:
+ !include-raw docu-verify.sh
- job-template:
name: 'doctor-merge'
- job-template:
name: 'doctor-merge'
+ node: master
+
# 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
@@
-148,6
+160,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:
@@
-173,10
+189,8
@@
branch-pattern: '**/master'
builders:
branch-pattern: '**/master'
builders:
- - shell: |
- pwd
- find .
- echo "merge logic goes here"
+ - shell:
+ !include-raw docu-build.sh