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
Add missing silicon jobs for distribution
[releng/builder.git]
/
jjb
/
integration
/
distribution
/
distribution-templates.yaml
diff --git
a/jjb/integration/distribution/distribution-templates.yaml
b/jjb/integration/distribution/distribution-templates.yaml
index dff504740b240d78381e39281870f373dd464a55..b7019f85492e06c48f1160bd88820ba3061593a2 100644
(file)
--- a/
jjb/integration/distribution/distribution-templates.yaml
+++ b/
jjb/integration/distribution/distribution-templates.yaml
@@
-6,7
+6,6
@@
# Default parameters #
######################
# Default parameters #
######################
- java-version: openjdk8
mvn-version: mvn35
csit-gate-list: ''
block_on_csit: false
mvn-version: mvn35
csit-gate-list: ''
block_on_csit: false
@@
-15,6
+14,7
@@
# plus the change of block_on_csit to true, and this failure-threshold: 'UNSTABLE' will take
# effect
failure-threshold: 'UNSTABLE'
# plus the change of block_on_csit to true, and this failure-threshold: 'UNSTABLE' will take
# effect
failure-threshold: 'UNSTABLE'
+ disable-job: false
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-23,12
+23,11
@@
# Operation: This job template builds a patch, creates a distribution containing
# the patch (making sure dependencies are specified),
# and performs the distribution deploy test.
# Operation: This job template builds a patch, creates a distribution containing
# the patch (making sure dependencies are specified),
# and performs the distribution deploy test.
- disabled:
false
+ disabled:
'{disable-job}'
project-type: freestyle
node: 'centos7-builder-8c-8g'
concurrent: true
project-type: freestyle
node: 'centos7-builder-8c-8g'
concurrent: true
- jdk: '{java-version}'
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-77,6
+76,8
@@
builders:
- distribution-check-wipe
builders:
- distribution-check-wipe
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- inject:
properties-file: 'allowed_projects.txt'
- distribution-check-build-project:
- inject:
properties-file: 'allowed_projects.txt'
- distribution-check-build-project:
@@
-129,10
+130,12
@@
- job-template:
name: 'distribution-verify-{type}-{stream}'
- job-template:
name: 'distribution-verify-{type}-{stream}'
+ disable-job: 'false'
+
project-type: freestyle
node: centos7-builder-8c-8g
concurrent: true
project-type: freestyle
node: centos7-builder-8c-8g
concurrent: true
-
jdk: '{java-version
}'
+
disabled: '{disable-job
}'
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-168,6
+171,8
@@
- lf-provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: 'integration-settings'
- lf-provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: 'integration-settings'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- maven-target:
maven-version: mvn35
pom: pom.xml
- maven-target:
maven-version: mvn35
pom: pom.xml
@@
-179,7
+184,7
@@
{profile}
# {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
java-opts:
{profile}
# {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
java-opts:
- - '-Xmx1024m
-XX:MaxPermSize=256m
'
+ - '-Xmx1024m'
settings: integration-settings
settings-type: cfp
global-settings: global-settings
settings: integration-settings
settings-type: cfp
global-settings: global-settings
@@
-201,9
+206,11
@@
# separate lifecycle:
# https://issues.apache.org/jira/browse/MNG-5666
# separate lifecycle:
# https://issues.apache.org/jira/browse/MNG-5666
+ disable-job: false
+
project-type: maven
node: 'centos7-builder-8c-8g'
project-type: maven
node: 'centos7-builder-8c-8g'
-
jdk: '{java-version
}'
+
disabled: '{disable-job
}'
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-244,6
+251,8
@@
- lf-provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: 'integration-settings'
- lf-provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: 'integration-settings'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- integration-set-variables
- distribute-build-url:
path: '$KARAF_ARTIFACT/src/main/assembly'
- integration-set-variables
- distribute-build-url:
path: '$KARAF_ARTIFACT/src/main/assembly'
@@
-257,7
+266,7
@@
-Dsft.heap.max=4g
-Djenkins -Dmerge -Dstream={stream}
{profile}
-Dsft.heap.max=4g
-Djenkins -Dmerge -Dstream={stream}
{profile}
- maven-opts: '-Xmx1024m
-XX:MaxPermSize=256m
'
+ maven-opts: '-Xmx1024m'
settings: integration-settings
settings-type: cfp
global-settings: global-settings
settings: integration-settings
settings-type: cfp
global-settings: global-settings
@@
-289,7
+298,7
@@
######################
# Default parameters #
######################
######################
# Default parameters #
######################
-
+ disable-job: false
mvn-version: mvn35
#####################
mvn-version: mvn35
#####################
@@
-297,12
+306,11
@@
#####################
# Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
#####################
# Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
- disabled:
false
+ disabled:
'{disable-job}'
project-type: freestyle
node: 'centos7-builder-8c-8g'
concurrent: true
project-type: freestyle
node: 'centos7-builder-8c-8g'
concurrent: true
- jdk: '{java-version}'
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-347,6
+355,8
@@
builders:
- distribution-check-wipe
builders:
- distribution-check-wipe
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- inject:
properties-file: 'allowed_projects.txt'
- distribution-check-build-project:
- inject:
properties-file: 'allowed_projects.txt'
- distribution-check-build-project:
@@
-388,7
+398,7
@@
# This job works for both managed & self-managed distro.
project-type: freestyle
# This job works for both managed & self-managed distro.
project-type: freestyle
- node: centos7-builder-
4c-4
g
+ node: centos7-builder-
2c-8
g
concurrent: false
properties:
concurrent: false
properties:
@@
-410,8
+420,14
@@
bundle-url: '{bundle-url}'
- integration-repo-url:
repo-url: '{sm-repos}'
bundle-url: '{bundle-url}'
- integration-repo-url:
repo-url: '{sm-repos}'
- - integration-controller-
feature
s:
+ - integration-controller-
parameter
s:
controller-features: '{sm-features}'
controller-features: '{sm-features}'
+ # Parameters below are unused in this job so set them all to blank
+ controller-max-mem: ''
+ controller-debug-map: ''
+ controller-scope: ''
+ controller-use-features-boot: ''
+ feature-elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-jdk-version:
jdkversion: '{jre}'
- distribution-karaf-version:
- integration-jdk-version:
jdkversion: '{jre}'
- distribution-karaf-version:
@@
-438,9
+454,12
@@
# Operation: This job deploys odl-integration-all.
# This job works for just managed distro.
# Operation: This job deploys odl-integration-all.
# This job works for just managed distro.
+ disable-job: false
+
project-type: freestyle
node: centos7-builder-4c-4g
concurrent: false
project-type: freestyle
node: centos7-builder-4c-4g
concurrent: false
+ disabled: '{disable-job}'
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties: