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
Remove {project}-integration-{stream} jobs
[releng/builder.git]
/
jjb
/
alto
/
alto.yaml
diff --git
a/jjb/alto/alto.yaml
b/jjb/alto/alto.yaml
index 59f4e5310987bd595910f09386bcf80bb54541d7..d1085a28f329ea47b0f5dd0394545862b009bb5a 100644
(file)
--- a/
jjb/alto/alto.yaml
+++ b/
jjb/alto/alto.yaml
@@
-3,25
+3,17
@@
name: alto-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
name: alto-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: oxygen
project: 'alto'
project-name: 'alto'
branch: 'master'
stream: oxygen
project: 'alto'
project-name: 'alto'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'alto-settings'
mvn-settings: 'alto-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'l2switch-merge-{stream}'
email-upstream: '[alto] [l2switch]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'l2switch-merge-{stream}'
email-upstream: '[alto] [l2switch]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 931eabae9693c
# Used by the release job
staging-profile-id: 931eabae9693c
@@
-30,25
+22,17
@@
name: alto-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
name: alto-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: nitrogen
project: 'alto'
project-name: 'alto'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'alto'
project-name: 'alto'
branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'alto-settings'
mvn-settings: 'alto-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'l2switch-merge-{stream}'
email-upstream: '[alto] [l2switch]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'l2switch-merge-{stream}'
email-upstream: '[alto] [l2switch]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 931eabae9693c
# Used by the release job
staging-profile-id: 931eabae9693c
@@
-57,26
+41,18
@@
name: alto-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
name: alto-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: carbon
project: 'alto'
project-name: 'alto'
branch: 'stable/carbon'
stream: carbon
project: 'alto'
project-name: 'alto'
branch: 'stable/carbon'
+ build-node: centos7-builder-2c-8g
karaf-version: karaf3
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'alto-settings'
mvn-settings: 'alto-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'l2switch-merge-{stream}'
email-upstream: '[alto] [l2switch]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'l2switch-merge-{stream}'
email-upstream: '[alto] [l2switch]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 931eabae9693c
# Used by the release job
staging-profile-id: 931eabae9693c
@@
-84,11
+60,11
@@
- project:
name: alto-sonar
jobs:
- project:
name: alto-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'alto'
project-name: 'alto'
branch: 'master'
project: 'alto'
project-name: 'alto'
branch: 'master'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'alto-settings'
mvn-settings: 'alto-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'