From: Sam Hague <shague@redhat.com>
Date: Thu, 24 Dec 2015 16:38:48 +0000 (-0500)
Subject: use jdk7 with stable/lithium
X-Git-Tag: release/beryllium~231
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F31871%2F1;p=releng%2Fbuilder.git

use jdk7 with stable/lithium

Also modifed the goal to not do the singleFeatureTest since that is covered with the verify and merge jobs.

Change-Id: Ib39a26d66bc6f3fcef08faa26f5e84654a4d102b
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index efe8151b2..8f5565b09 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -13,9 +13,9 @@
                 - openjdk8
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: openjdk8
+            jdk: openjdk7
             jdks:
-                - openjdk8
+                - openjdk7
 
     project: 'ovsdb'
 
@@ -41,8 +41,8 @@
                 - 2.4.0
         - axis:
             type: jdk
-            values:
-                - openjdk8
+            values: '{obj:jdks}'
+
         - axis:
             type: slave
             name: nodes
@@ -90,7 +90,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install verify -Pintegrationtest,jenkins -V -Dovsdb.controller.address=${{CONTROLLER_IP}}'
+            goals: 'clean install -V verify -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'