Merge "Remove all refs to nitrogen in packaging"

[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 60473bb322df49fcb79db4fc03befb1cd51b85c1..034696f571437adbe2a17c7285bebdb9e0a287e7 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,13 +5,10 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - oxygen:
+          branch: 'stable/oxygen'
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -95,7 +92,7 @@
 
     project-type: freestyle
     node: centos7-docker-1c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
     description: >
         Integration tests for the OVSDB project against different versions of
         OVS and branches. This job runs nightly.