Merge "Fix validate-autorelease JAVA_HOME not set"

[releng/builder.git] / jjb / ovsdb / ovsdb-full-integration.yaml

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 0e24962d8046d150eafb5cc7030a3ed2717faaa4..dc40a19352bad0033f4bde0c7e65f277903354e9 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,15 +5,13 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - fluorine:
+      - aluminium:
           branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+      - sodium:
+          branch: 'stable/sodium'
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -36,7 +34,7 @@
             - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
             - 'stream={stream}'
           java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m'
+            - '-Xmx1024m'
           settings: 'ovsdb-settings'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -95,12 +93,15 @@
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
 
+    disable-job: false
+
     project-type: freestyle
     node: centos7-docker-1c-4g
     jdk: '{java-version}'
     description: >
         Integration tests for the OVSDB project against different versions of
         OVS and branches. This job runs nightly.
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -154,7 +155,7 @@
             - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
             - 'stream={stream}'
           java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m'
+            - '-Xmx1024m'
           settings: 'ovsdb-settings'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -167,7 +168,7 @@
           maven-version: 'mvn33'
           stream: '{stream}'
           OVS_VERSION: '2.5.0'
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification: