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
Switch all projects to use new maven-merge job
[releng/builder.git]
/
jjb
/
eman
/
eman.yaml
diff --git
a/jjb/eman/eman.yaml
b/jjb/eman/eman.yaml
index d1912750069c13b937fc61baa3664f1c0600be4e..f889912ee04b09af05ed6dfb6d5ce5f5a10e3346 100644
(file)
--- a/
jjb/eman/eman.yaml
+++ b/
jjb/eman/eman.yaml
@@
-6,7
+6,6
@@
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- - '{project-name}-merge-{stream}'
stream: oxygen
project: 'eman'
stream: oxygen
project: 'eman'
@@
-23,6
+22,7
@@
dependencies: ''
email-upstream: '[eman]'
archive-artifacts: ''
dependencies: ''
email-upstream: '[eman]'
archive-artifacts: ''
+ build-node: centos7-builder-4c-16g
# Used by the release job
staging-profile-id: 96e9352979521
# Used by the release job
staging-profile-id: 96e9352979521
@@
-34,7
+34,6
@@
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- - '{project-name}-merge-{stream}'
stream: nitrogen
project: 'eman'
stream: nitrogen
project: 'eman'
@@
-51,6
+50,7
@@
dependencies: ''
email-upstream: '[eman]'
archive-artifacts: ''
dependencies: ''
email-upstream: '[eman]'
archive-artifacts: ''
+ build-node: centos7-builder-4c-16g
# Used by the release job
staging-profile-id: 96e9352979521
# Used by the release job
staging-profile-id: 96e9352979521
@@
-62,7
+62,6
@@
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- - '{project-name}-merge-{stream}'
stream: carbon
project: 'eman'
stream: carbon
project: 'eman'
@@
-80,6
+79,7
@@
dependencies: ''
email-upstream: '[eman]'
archive-artifacts: ''
dependencies: ''
email-upstream: '[eman]'
archive-artifacts: ''
+ build-node: centos7-builder-4c-16g
# Used by the release job
staging-profile-id: 96e9352979521
# Used by the release job
staging-profile-id: 96e9352979521
@@
-87,7
+87,7
@@
- project:
name: eman-sonar
jobs:
- project:
name: eman-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'eman'
project-name: 'eman'
branch: 'master'
project: 'eman'
project-name: 'eman'
branch: 'master'