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
/
ttp
/
ttp.yaml
diff --git
a/jjb/ttp/ttp.yaml
b/jjb/ttp/ttp.yaml
index c5c0a8981f243d7d31c1302fc3db426fea329a34..b92ebd1c78e7c4d218918a4730dc0e2b9aaace48 100644
(file)
--- a/
jjb/ttp/ttp.yaml
+++ b/
jjb/ttp/ttp.yaml
@@
-2,89
+2,64
@@
- project:
name: ttp-oxygen
jobs:
- project:
name: ttp-oxygen
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - odl-maven-jobs
stream: oxygen
project: 'ttp'
project-name: 'ttp'
branch: 'master'
stream: oxygen
project: 'ttp'
project-name: 'ttp'
branch: 'master'
- jdk: openjdk8
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'ttp-settings'
mvn-settings: 'ttp-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[ttp] [odlparent]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[ttp] [odlparent]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: a693f948563d5
- project:
name: ttp-nitrogen
jobs:
- project:
name: ttp-nitrogen
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - odl-maven-jobs
stream: nitrogen
project: 'ttp'
project-name: 'ttp'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'ttp'
project-name: 'ttp'
branch: 'stable/nitrogen'
- jdk: openjdk8
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'ttp-settings'
mvn-settings: 'ttp-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[ttp] [odlparent]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[ttp] [odlparent]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: a693f948563d5
- project:
name: ttp-carbon
jobs:
- project:
name: ttp-carbon
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - odl-maven-jobs
stream: carbon
project: 'ttp'
project-name: 'ttp'
branch: 'stable/carbon'
karaf-version: karaf3
stream: carbon
project: 'ttp'
project-name: 'ttp'
branch: 'stable/carbon'
karaf-version: karaf3
- jdk: openjdk8
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'ttp-settings'
mvn-settings: 'ttp-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[ttp] [odlparent]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[ttp] [odlparent]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: a693f948563d5
- project:
name: ttp-sonar
jobs:
- project:
name: ttp-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'ttp'
project-name: 'ttp'
branch: 'master'
mvn-settings: 'ttp-settings'
project: 'ttp'
project-name: 'ttp'
branch: 'master'
mvn-settings: 'ttp-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'