X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-full-integration.yaml;h=911e0eb0870ec2e78a0b4084a4f85bbee7855b6e;hb=084d3d05ae1613e7449813ab1af59a2a9886fb0d;hp=e63b20470428b27198cfba1b5260e70f985cd795;hpb=d237aeb07453a010f9206543196f98cf1c5fb8cb;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index e63b20470..911e0eb08 100644
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -5,21 +5,21 @@
       - '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
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
+          karaf-version: karaf3
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'
@@ -46,7 +46,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
@@ -71,7 +71,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
@@ -109,8 +109,9 @@
       - shell: |
           virtualenv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip install docker-compose
+          PYTHON="$WORKSPACE/venv/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install docker-compose
 
 
 - builder:
@@ -156,6 +157,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -172,7 +174,6 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '@midnight'
       - gerrit:
           server-name: '{server-name}'
           trigger-on:
@@ -204,7 +205,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       # skip 2.4.0 until we figure out conntrack
       # - run-netvirt-it:
@@ -227,5 +228,4 @@
           succeed-if-found: false
           unstable-if-found: true
           also-check-console-output: false
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish