Rename odl-global-settings to global-settings

[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 c2665f0dcee1e138fab8b09d66889308b81cc750..911e0eb0870ec2e78a0b4084a4f85bbee7855b6e 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -20,12 +20,6 @@
           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'
@@ -52,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:
@@ -77,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:
@@ -115,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:
@@ -210,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:
@@ -233,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