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 changes from topic "bashisms"
[releng/builder.git]
/
jjb
/
controller
/
controller.yaml
diff --git
a/jjb/controller/controller.yaml
b/jjb/controller/controller.yaml
index 8f131229d9d0e67e81769aa11e4de07c5be32bf6..a8f4060dcc3a148819ec888ad61fa276d1cf7f9e 100644
(file)
--- a/
jjb/controller/controller.yaml
+++ b/
jjb/controller/controller.yaml
@@
-7,18
+7,17
@@
project-pattern: controller
rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
project-pattern: controller
rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
- - odl-maven-jobs-jdk1
1
- - odl-maven-verify-jobs
+ - odl-maven-jobs-jdk1
7
+ - odl-maven-verify-jobs
-jdk17
stream: master
project: "controller"
project-name: "controller"
stream: master
project: "controller"
project-name: "controller"
- branch: "master"
- java-version: "openjdk11"
+ branch: master
+ build-node: centos8-builder-4c-4g
+ java-version: "openjdk17"
mvn-settings: "controller-settings"
mvn-settings: "controller-settings"
- mvn-version: mvn36
mvn-goals: "clean deploy -Pdocs"
mvn-goals: "clean deploy -Pdocs"
- mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
build-timeout: 90
dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
build-timeout: 90
dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
@@
-27,7
+26,7
@@
staging-profile-id: 96c1c9177efdd
- project:
staging-profile-id: 96c1c9177efdd
- project:
- name: controller-
2
.0.x
+ name: controller-
5
.0.x
jobs:
- "{project-name}-rtd-jobs":
build-node: centos7-builder-2c-2g
jobs:
- "{project-name}-rtd-jobs":
build-node: centos7-builder-2c-2g
@@
-36,14
+35,15
@@
rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
- odl-maven-jobs-jdk11
- odl-maven-verify-jobs
rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
- odl-maven-jobs-jdk11
- odl-maven-verify-jobs
+ - odl-maven-verify-jobs-jdk17:
+ build-node: centos8-builder-4c-4g
- stream:
2
.0.x
+ stream:
5
.0.x
project: "controller"
project-name: "controller"
project: "controller"
project-name: "controller"
- branch:
"2.0.x"
+ branch:
5.0.x
java-version: "openjdk11"
mvn-settings: "controller-settings"
java-version: "openjdk11"
mvn-settings: "controller-settings"
- mvn-version: mvn36
mvn-goals: "clean deploy -Pdocs"
mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
build-timeout: 90
mvn-goals: "clean deploy -Pdocs"
mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
build-timeout: 90
@@
-54,9
+54,8
@@
staging-profile-id: 96c1c9177efdd
- project:
staging-profile-id: 96c1c9177efdd
- project:
- name: controller-
magnesium
+ name: controller-
4.0.x
jobs:
jobs:
- - "{project-name}-distribution-check-{stream}":
- "{project-name}-rtd-jobs":
build-node: centos7-builder-2c-2g
project-pattern: controller
- "{project-name}-rtd-jobs":
build-node: centos7-builder-2c-2g
project-pattern: controller
@@
-65,15
+64,15
@@
- odl-maven-jobs-jdk11
- odl-maven-verify-jobs
- odl-maven-jobs-jdk11
- odl-maven-verify-jobs
- stream:
magnesium
+ stream:
4.0.x
project: "controller"
project-name: "controller"
project: "controller"
project-name: "controller"
- branch: "
stable/magnesium
"
+ branch: "
4.0.x
"
java-version: "openjdk11"
mvn-settings: "controller-settings"
java-version: "openjdk11"
mvn-settings: "controller-settings"
- mvn-
goals: "clean deploy -Pintegrationtests,docs"
- mvn-
opts: "-Xmx4096m -Dmaven.compile.fork=true
"
- build-node: centos7-builder-8c-8g
+ mvn-
version: mvn36
+ mvn-
goals: "clean deploy -Pdocs
"
+ mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
build-timeout: 90
dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
build-timeout: 90
dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
@@
-91,6
+90,9
@@
build-node: centos7-builder-2c-1g
mvn-settings: controller-settings
build-node: centos7-builder-2c-1g
mvn-settings: controller-settings
+ # Needs to be rather long until we sort out the performance of
+ # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+ build-timeout: 120
- project:
name: controller-sonar
- project:
name: controller-sonar
@@
-106,7
+108,9
@@
project: "controller"
project-name: "controller"
branch: master
project: "controller"
project-name: "controller"
branch: master
- java-version: "openjdk11"
+ build-node: centos8-builder-4c-4g
+ java-version: "openjdk17"
+ mvn-version: mvn38
mvn-settings: "controller-settings"
mvn-goals: "clean deploy -Pintegrationtests,docs"
mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
mvn-settings: "controller-settings"
mvn-goals: "clean deploy -Pintegrationtests,docs"
mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"