Merge "Remove next carbon jobs"

[releng/builder.git] / jjb / netvirt / netvirt-full-integration.yaml

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 043b62f1231ec341418a5727f557e5ac43098902..8cf106f8837c77fc3c00813402df58e71e900594 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -5,13 +5,12 @@
       - 'netvirt-daily-full-integration-{stream}'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'
@@ -138,7 +137,7 @@
     project-type: freestyle
     node: centos7-docker-1c-4g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
     description: >
         Integration tests for the Netvirt project against different versions of
         OVS and branches. This job runs nightly.