add support for JVM monitoring

[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 054d441c6961e42cec1a901e85b0ca15b5e13d53..4abf4ee46475a56b355c897d1769163cc3f71b44 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -6,7 +6,6 @@
     # Default parameters #
     ######################
 
-    java-version: openjdk8
     mvn-version: mvn35
     csit-gate-list: ''
     block_on_csit: false
@@ -29,7 +28,6 @@
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -78,6 +76,8 @@
 
     builders:
       - distribution-check-wipe
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - inject:
           properties-file: 'allowed_projects.txt'
       - distribution-check-build-project:
@@ -135,7 +135,6 @@
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
-    jdk: '{java-version}'
     disabled: '{disable-job}'
 
     properties:
@@ -172,6 +171,8 @@
       - 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
@@ -183,7 +184,7 @@
               {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
@@ -209,7 +210,6 @@
 
     project-type: maven
     node: 'centos7-builder-8c-8g'
-    jdk: '{java-version}'
     disabled: '{disable-job}'
 
     properties:
@@ -251,6 +251,8 @@
       - 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'
@@ -264,7 +266,7 @@
           -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
@@ -309,7 +311,6 @@
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -354,6 +355,8 @@
 
     builders:
       - distribution-check-wipe
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - inject:
           properties-file: 'allowed_projects.txt'
       - distribution-check-build-project:
@@ -395,7 +398,7 @@
     # This job works for both managed & self-managed distro.
 
     project-type: freestyle
-    node: centos7-builder-4c-4g
+    node: centos7-builder-2c-8g
     concurrent: false
 
     properties:
@@ -423,6 +426,7 @@
           controller-debug-map: ''
           controller-scope: ''
           controller-use-features-boot: ''
+          feature-elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version: