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 "Update example builds to test in RPM verify jobs"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index c253bb5a58e8cb17645d1cc6abec61486eb17c11..bac9e13d229c5471cff74a1a0976c5725fa44393 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-105,6
+105,7
@@
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
+ - integration-install-common-functions
- integration-deploy-controller-run-test
- integration-cleanup-tmp
- integration-deploy-controller-run-test
- integration-cleanup-tmp
@@
-197,6
+198,7
@@
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
+ - integration-install-common-functions
- integration-deploy-controller-run-test
- integration-cleanup-tmp
- integration-deploy-controller-run-test
- integration-cleanup-tmp
@@
-312,6
+314,7
@@
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
+ - integration-install-common-functions
- integration-deploy-controller-run-test
- integration-cleanup-tmp
- integration-deploy-controller-run-test
- integration-cleanup-tmp
@@
-544,6
+547,7
@@
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
+ - integration-install-common-functions
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-cleanup-tmp
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-cleanup-tmp
@@
-631,6
+635,7
@@
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
+ - integration-install-common-functions
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-cleanup-tmp
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-cleanup-tmp
@@
-743,6
+748,7
@@
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
+ - integration-install-common-functions
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-cleanup-tmp
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-cleanup-tmp
@@
-859,6
+865,7
@@
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
+ - integration-install-common-functions
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-cleanup-tmp
- integration-configure-clustering
- integration-start-cluster-run-test
- integration-cleanup-tmp
@@
-1204,6
+1211,7
@@
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
+ - integration-install-common-functions
- integration-deploy-controller-run-test
- integration-deploy-openstack-run-test
- integration-cleanup-tmp
- integration-deploy-controller-run-test
- integration-deploy-openstack-run-test
- integration-cleanup-tmp
@@
-1410,6
+1418,7
@@
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
- inject:
properties-file: 'slave_addresses.txt'
- integration-detect-variables
+ - integration-install-common-functions
- integration-deploy-controller-run-test
- integration-deploy-openstack-run-test
- integration-cleanup-tmp
- integration-deploy-controller-run-test
- integration-deploy-openstack-run-test
- integration-cleanup-tmp
@@
-1437,7
+1446,7
@@
project-type: freestyle
node: centos7-builder-2c-8g
concurrent: true
project-type: freestyle
node: centos7-builder-2c-8g
concurrent: true
- jdk: '{j
dk
}'
+ jdk: '{j
ava-version
}'
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-1505,10
+1514,11
@@
clean install dependency:tree
-Pq
-Dgitid.skip=false
clean install dependency:tree
-Pq
-Dgitid.skip=false
+ -Dmaven.gitcommitid.skip=false
-DgenerateReports=false
-Dstream={stream}
{opendaylight-infra-mvn-opts}
-DgenerateReports=false
-Dstream={stream}
{opendaylight-infra-mvn-opts}
- #
TODO: {opendaylight-infra-parallel-mvn-opts}?
+ #
{opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
java-opts:
- '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: integration-settings
java-opts:
- '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
settings: integration-settings
@@
-1522,7
+1532,9
@@
clean install dependency:tree
-Pq
-Dgitid.skip=false
clean install dependency:tree
-Pq
-Dgitid.skip=false
- {opendaylight-infra-parallel-mvn-opts}
+ -Dmaven.gitcommitid.skip=false
+ {opendaylight-infra-mvn-opts}
+ # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
java-opts:
- '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
settings: integration-settings
java-opts:
- '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
settings: integration-settings