Archive all logs as build artifacts

[releng/builder.git] / jjb / integration / integration-test-jobs.yaml

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 5bdbca5211c92276209f0118d69d18de7ccc9c84..42c1f7e12004ad657ea28f16aad8cfe3e0b0327e 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -12,6 +12,7 @@
         - boron:
             branch: 'master'
             jdk: 'openjdk8'
+            jre: 'openjdk8'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -74,6 +75,7 @@
         - beryllium:
             branch: 'stable/beryllium'
             jdk: 'openjdk7'
+            jre: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -138,6 +140,7 @@
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: 'openjdk7'
+            jre: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -185,6 +188,7 @@
         - stable-helium:
             branch: 'stable/helium'
             jdk: 'openjdk7'
+            jre: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-imds-authn-only-{stream},
                 aaa-csit-1node-imds-authn-all-{stream},
@@ -284,19 +288,20 @@
             controller-scope: 'only'
         - integration-controller-features:
             controller-features: >
+                odl-clustering-test-app,
                 odl-openflowplugin-flow-services-ui,
                 odl-bgpcep-pcep,
                 odl-bgpcep-bgp,
                 odl-netconf-connector-all
         - integration-test-options:
-            test-options: '-e adsal'
+            test-options: '-e adsal -v TIMEOUT_BUG_4220:10s'
         - integration-test-plan:
             test-plan: 'test-libraries.txt'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
         - integration-jdk-version:
-            # {jdk} is from releng-defaults
-            jdkversion: '{jdk}'
+            jdkversion: 'openjdk7'
+            # TODO: Switch to openjdk8 from Boron on.
 
     scm:
         - integration-gerrit-scm:
@@ -341,7 +346,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[integration]'
 
@@ -365,7 +370,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     triggers:
         - timed: 'H H * * 6'
@@ -377,8 +382,6 @@
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
 
-                  JDKVERSION=$JDKVERSION
-
     publishers:
         - email-notification:
             email-prefix: '[integration]'