Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix for Pike/Queens Jobs"
[releng/builder.git]
/
jjb
/
natapp
/
natapp-csit-basic.yaml
diff --git
a/jjb/natapp/natapp-csit-basic.yaml
b/jjb/natapp/natapp-csit-basic.yaml
index 6e16dcea6a43e9fee1d0b2685232c44532c45202..e84130304a1e4c1b35908b884831c26cac52c462 100644
(file)
--- a/
jjb/natapp/natapp-csit-basic.yaml
+++ b/
jjb/natapp/natapp-csit-basic.yaml
@@
-2,8
+2,8
@@
- project:
name: natapp-csit-basic
jobs:
- project:
name: natapp-csit-basic
jobs:
- -
'{project}-csit-1node-{functionality}-{install}-{stream}'
- -
'{project}-csit-verify-1node-{functionality}'
+ -
inttest-csit-1node
+ -
inttest-csit-verify-1node
# The project name
project: 'natapp'
# The project name
project: 'natapp'
@@
-13,15
+13,14
@@
# Project branches
stream:
# Project branches
stream:
- -
oxygen
:
+ -
fluorine
:
branch: 'master'
branch: 'master'
- jre: 'openjdk8'
+ - oxygen:
+ branch: 'stable/oxygen'
- nitrogen:
branch: 'stable/nitrogen'
- nitrogen:
branch: 'stable/nitrogen'
- jre: 'openjdk8'
- carbon:
branch: 'stable/carbon'
- carbon:
branch: 'stable/carbon'
- jre: 'openjdk8'
karaf-version: karaf3
install:
karaf-version: karaf3
install: