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
/
groupbasedpolicy
/
groupbasedpolicy-csit-6node.yaml
diff --git
a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 47d42d7e664099b79771de9328ee21ced5960a54..1444524aa5ce9c6129b6c29df215c69782590107 100644
(file)
--- a/
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@
-2,7
+2,7
@@
- project:
name: groupbasedpolicy-csit-6node
jobs:
- project:
name: groupbasedpolicy-csit-6node
jobs:
- -
'{project}-csit-1node-{functionality}-{install}-{stream}'
+ -
inttest-csit-1node
# The project name
# The project name
@@
-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:
@@
-30,7
+29,7
@@
# 6 Ubuntu VMs in JCloud configuration
tools_system_count: 6
# 6 Ubuntu VMs in JCloud configuration
tools_system_count: 6
- tools_system_image:
Ubuntu 14.04 - gbp - 20170823-0530
+ tools_system_image:
ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
# Features to install
install-features: >
# Features to install
install-features: >