X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-full-integration.yaml;h=dc40a19352bad0033f4bde0c7e65f277903354e9;hb=a87fca6f6aa3b263d1695a568708c247cb5ed604;hp=bc0c2c723a9a65b3bc121d3465d62418493eea24;hpb=e8a56411730412990a7ad3ef97bcee5643d981a9;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index bc0c2c723..dc40a1935 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,24 +5,13 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - nitrogen:
+      - aluminium:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-      - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+      - sodium:
+          branch: 'stable/sodium'
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -45,10 +34,10 @@
             - '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: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
@@ -83,7 +72,7 @@
     builders:
       - inject:
           properties-content: OVS_VERSION={OVS_VERSION}
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - run-southbound-it:
@@ -99,17 +88,20 @@
           OVS_VERSION: '{OVS_VERSION}'
           maven-version: '{maven-version}'
           stream: '{stream}'
-      - shell: !include-raw-escape: include-raw-cleanup-docker.sh
+      - shell: !include-raw-escape: cleanup-docker.sh
 
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
 
+    disable-job: false
+
     project-type: freestyle
-    node: centos7-docker-2c-4g
-    jdk: '{jdk}'
+    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:
@@ -136,7 +128,7 @@
     triggers:
       - timed: '@midnight'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'runit'
@@ -163,10 +155,10 @@
             - '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: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - run-ovsdb-it:
           maven-version: 'mvn33'
@@ -176,11 +168,10 @@
           maven-version: 'mvn33'
           stream: '{stream}'
           OVS_VERSION: '2.5.0'
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[ovsdb]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish