X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-full-integration.yaml;h=4936a4704785bdad7c764c368bd8da603b38170f;hb=3c3bec550bb8e339636a91848823fd1b8990e6f0;hp=c5711b65f08d12dd55137aa42642c5caad196694;hpb=8d12b324463c0e3357d7eb2f52e63319d0ef9068;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index c5711b65f..4936a4704 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,21 +5,14 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - nitrogen:
+      - sodium:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -80,7 +73,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:
@@ -96,14 +89,14 @@
           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}'
 
     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.
@@ -133,7 +126,7 @@
     triggers:
       - timed: '@midnight'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'runit'
@@ -173,7 +166,7 @@
           maven-version: 'mvn33'
           stream: '{stream}'
           OVS_VERSION: '2.5.0'
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification: