X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-full-integration.yaml;h=c81a46d14baaeb865b28ee19fc84c53391981a26;hb=d2728da8c27b3fa350c24308ff364f2a469596c7;hp=e63b20470428b27198cfba1b5260e70f985cd795;hpb=5d15e6506e2fedd8e0c6ad9c59d16c95b8986647;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index e63b20470..c81a46d14 100644
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -5,21 +5,13 @@
       - 'netvirt-daily-full-integration-{stream}'
 
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-      - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'
@@ -46,7 +38,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 +63,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 +101,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:
@@ -130,14 +123,14 @@
           OVS_VERSION: '{OVS_VERSION}'
           maven-version: '{maven-version}'
           stream: '{stream}'
-      - shell: !include-raw-escape: include-raw-setup-docker.sh
+      - shell: !include-raw-escape: setup-docker.sh
       - inject:
           properties-file: env.properties
       - run-netvirt-sfc-it:
           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: 'netvirt-daily-full-integration-{stream}'
@@ -156,6 +149,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -172,9 +166,8 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '@midnight'
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'runit'
@@ -204,7 +197,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 +220,4 @@
           succeed-if-found: false
           unstable-if-found: true
           also-check-console-output: false
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish