Make jobs karaf-version specific, some duplicities

[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 e63b20470428b27198cfba1b5260e70f985cd795..c2665f0dcee1e138fab8b09d66889308b81cc750 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -5,21 +5,27 @@
       - 'netvirt-daily-full-integration-{stream}'
 
     stream:
-      - carbon:
+      - nitrogen:
           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
       - beryllium:
           branch: 'stable/beryllium'
           jdk: openjdk8
           jdks:
             - openjdk8
+          karaf-version: karaf3
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'
@@ -156,6 +162,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -172,7 +179,6 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '@midnight'
       - gerrit:
           server-name: '{server-name}'
           trigger-on: