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
/
yangtools
/
yangtools.yaml
diff --git
a/jjb/yangtools/yangtools.yaml
b/jjb/yangtools/yangtools.yaml
index 34866f95158e3df03e2d854a4e778938bd756d9d..2812b50aafd289c43a1023287d2b8dd08aa3e0f9 100644
(file)
--- a/
jjb/yangtools/yangtools.yaml
+++ b/
jjb/yangtools/yangtools.yaml
@@
-2,28
+2,26
@@
- project:
name: yangtools-master
jobs:
- project:
name: yangtools-master
jobs:
- - '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
odl-maven-jobs
project: yangtools
project-name: yangtools
branch: master
stream: master
project: yangtools
project-name: yangtools
branch: master
stream: master
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'yangtools-settings'
mvn-settings: 'yangtools-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: mvn33
dependencies: ''
email-upstream: '[yangtools]'
dependencies: ''
email-upstream: '[yangtools]'
- archive-artifacts: ''
+ archive-artifacts: >
+ **/*.prop
+ **/*.log
+ **/target/surefire-reports/*-output.txt
+ **/target/failsafe-reports/failsafe-summary.xml
+ **/hs_err_*.log
+ **/target/feature/feature.xml
# Used by the release job
staging-profile-id: 1271cf710cc09d
# Used by the release job
staging-profile-id: 1271cf710cc09d
@@
-32,29
+30,26
@@
name: yangtools-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
name: yangtools-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
odl-maven-jobs
stream: nitrogen
project: 'yangtools'
project-name: 'yangtools'
branch: 'v1.2.x'
distribution_branch: 'stable/nitrogen'
stream: nitrogen
project: 'yangtools'
project-name: 'yangtools'
branch: 'v1.2.x'
distribution_branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'yangtools-settings'
mvn-settings: 'yangtools-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: mvn33
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[yangtools] [odlparent]'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[yangtools] [odlparent]'
- archive-artifacts: ''
+ archive-artifacts: >
+ **/*.prop
+ **/*.log
+ **/target/surefire-reports/*-output.txt
+ **/target/failsafe-reports/failsafe-summary.xml
+ **/hs_err_*.log
+ **/target/feature/feature.xml
# Used by the release job
staging-profile-id: 1271cf710cc09d
# Used by the release job
staging-profile-id: 1271cf710cc09d
@@
-63,29
+58,26
@@
name: yangtools-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
name: yangtools-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
odl-maven-jobs
stream: carbon
project: 'yangtools'
project-name: 'yangtools'
branch: 'stable/carbon'
karaf-version: karaf3
stream: carbon
project: 'yangtools'
project-name: 'yangtools'
branch: 'stable/carbon'
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'yangtools-settings'
mvn-settings: 'yangtools-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- mvn-version: mvn33
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[yangtools] [odlparent]'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[yangtools] [odlparent]'
- archive-artifacts: ''
+ archive-artifacts: >
+ **/*.prop
+ **/*.log
+ **/target/surefire-reports/*-output.txt
+ **/target/failsafe-reports/failsafe-summary.xml
+ **/hs_err_*.log
+ **/target/feature/feature.xml
# Used by the release job
staging-profile-id: 1271cf710cc09d
# Used by the release job
staging-profile-id: 1271cf710cc09d
@@
-99,5
+91,4
@@
project-name: 'yangtools'
branch: 'master'
mvn-settings: 'yangtools-settings'
project-name: 'yangtools'
branch: 'master'
mvn-settings: 'yangtools-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'