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 fb4237169d7b7c143a9362775207699c05df6905..4abf4ee46475a56b355c897d1769163cc3f71b44 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -1,7 +1,4 @@
 ---
-- project:
-    name: distribution-templates
-
 - job-template:
     name: '{project-name}-distribution-check-{stream}'
 
@@ -9,7 +6,6 @@
     # Default parameters #
     ######################
 
-    java-version: openjdk8
     mvn-version: mvn35
     csit-gate-list: ''
     block_on_csit: false
@@ -18,6 +14,7 @@
     # 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 #
@@ -26,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.
-    disabled: false
+    disabled: '{disable-job}'
 
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -80,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:
@@ -132,10 +130,12 @@
 - job-template:
     name: 'distribution-verify-{type}-{stream}'
 
+    disable-job: 'false'
+
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
-    jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -168,9 +168,11 @@
 
     builders:
       - wipe-org-opendaylight-repo
-      - provide-maven-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
@@ -182,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
@@ -204,9 +206,11 @@
     # separate lifecycle:
     #     https://issues.apache.org/jira/browse/MNG-5666
 
+    disable-job: false
+
     project-type: maven
     node: 'centos7-builder-8c-8g'
-    jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -243,10 +247,12 @@
 
     prebuilders:
       - wipe-org-opendaylight-repo
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
+      - lf-jacoco-nojava-workaround
+      - 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'
@@ -260,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
@@ -292,7 +298,7 @@
     ######################
     # Default parameters #
     ######################
-
+    disable-job: false
     mvn-version: mvn35
 
     #####################
@@ -300,12 +306,11 @@
     #####################
 
     # 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
-    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -350,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:
@@ -391,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:
@@ -413,8 +420,13 @@
           bundle-url: '{bundle-url}'
       - integration-repo-url:
           repo-url: '{sm-repos}'
-      - integration-controller-features:
+      - integration-controller-parameters:
           controller-features: '{sm-features}'
+          # Parameters below are unused in this job so set them all to blank
+          controller-debug-map: ''
+          controller-scope: ''
+          controller-use-features-boot: ''
+          feature-elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
@@ -441,9 +453,12 @@
     # 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
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -481,4 +496,3 @@
           email-prefix: '[{project-name}]'
       - integration-csit-archive-build
       - lf-infra-publish
-