X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-full-integration.yaml;h=fc46b0df833698edf5496a3f64871c4151cd9372;hb=277e6f6ee3df23e731f87b1850e8329bb69e324d;hp=87fee427ed361f89e18d70e13a404d6937df21f1;hpb=ece6a462c2e9580514d1e610d8f81c1e805e6685;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 87fee427e..fc46b0df8 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -20,12 +20,6 @@
           jdks:
             - openjdk8
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-          karaf-version: karaf3
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -51,7 +45,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'ovsdb-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
@@ -86,7 +80,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:
@@ -102,7 +96,7 @@
           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}'
@@ -169,7 +163,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           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'
@@ -185,5 +179,4 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[ovsdb]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish