Remove lispflowmapping helium jobs

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 888586cc3f8115dca637906561d585d94a08c68e..47f414b9b6d88da27659d61ce691131b92477ed0 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -15,6 +15,7 @@
 # Parameters:
 #
 # project-parameter: main project integration/test ($PROJECT)
+# jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
 # integration-branch: distribution branch ($BRANCH)
 # integration-controller-bundleurl: distribution URL ($BUNDLEURL)
 # integration-controller-scope: only or all features ($CONTROLLERSCOPE)
@@ -56,7 +57,7 @@
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -101,7 +102,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
 
@@ -136,7 +137,7 @@
         - integration-patch-refspec:
             branch: 'stable/helium'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -180,7 +181,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -243,6 +244,7 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
             jdkversion: 'openjdk7'
+            # TODO: Switch to openjdk8 from Boron on.
 
     scm:
         - integration-gerrit-scm:
@@ -287,7 +289,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
 
@@ -322,7 +324,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -365,7 +367,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -425,7 +427,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -466,7 +468,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*.log,karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -525,6 +527,7 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
             jdkversion: 'openjdk7'
+            # TODO: Switch to openjdk8 from Boron on.
 
     scm:
         - integration-gerrit-scm:
@@ -571,7 +574,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
 
@@ -606,7 +609,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -651,7 +654,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -711,7 +714,7 @@
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -754,7 +757,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
         - plot: