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
/
octopus
/
octopus.yml
diff --git
a/jjb/octopus/octopus.yml
b/jjb/octopus/octopus.yml
index
db35515
..
fe1713c
100644
(file)
--- a/
jjb/octopus/octopus.yml
+++ b/
jjb/octopus/octopus.yml
@@
-1,19
+1,27
@@
+################################
+# job configuration for Octopus
+################################
- project:
name: octopus
jobs:
- 'octopus-test'
- project:
name: octopus
jobs:
- 'octopus-test'
- - 'octopus-daily-
{stream}
'
+ - 'octopus-daily-
master
'
- 'octopus-merge'
- 'octopus-merge'
- - 'octopus-verify'
+ - 'octopus-verify
-{stream}
'
- # stream: branch with - in place of / (eg. stable-
helium
)
- # branch: branch (eg. stable/
helium
)
+ # stream: branch with - in place of / (eg. stable-
arno
)
+ # branch: branch (eg. stable/
arno
)
stream:
- master:
branch: 'master'
stream:
- master:
branch: 'master'
+ - stable-arno:
+ branch: 'stable/arno'
project: 'octopus'
somevar: 'foo'
project: 'octopus'
somevar: 'foo'
+###############################
+# job templates
+###############################
- job-template:
name: octopus-test
- job-template:
name: octopus-test
@@
-31,7
+39,7
@@
echo "Hello world from octopus"
- job-template:
echo "Hello world from octopus"
- job-template:
- name: 'octopus-daily-
{stream}
'
+ name: 'octopus-daily-
master
'
node: master
node: master
@@
-58,7
+66,7
@@
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch:
'{branch}'
+ branch:
master
wrappers:
- ssh-agent-credentials:
wrappers:
- ssh-agent-credentials:
@@
-78,7
+86,7
@@
- test-macro
- job-template:
- test-macro
- job-template:
- name: 'octopus-verify'
+ name: 'octopus-verify
-{stream}
'
node: master
node: master
@@
-94,7
+102,7
@@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: '
master
'
+ branch: '
{branch}
'
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@
-122,11
+130,11
@@
project-pattern: 'octopus'
branches:
- branch-compare-type: 'ANT'
project-pattern: 'octopus'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/
master
'
+ branch-pattern: '**/
{branch}
'
builders:
- shell:
builders:
- shell:
- !include-raw docu-
verify
.sh
+ !include-raw docu-
build
.sh
- job-template:
name: 'octopus-merge'
- job-template:
name: 'octopus-merge'