Merge "Migrate openflowjava to global-jjb Maven jobs"

[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 c5711b65f08d12dd55137aa42642c5caad196694..ad0238ba4698e7c922ceebcbdeb868c4e6cce195 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,20 +5,12 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
           karaf-version: karaf3
 
     project: 'ovsdb'
@@ -80,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:
@@ -96,7 +88,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}'