Remove references to karaf in hc2vpp and honeycomb jobs

Karaf is neither used in honeycomb nor in hc2vpp

Change-Id: I9f85f3391e5dd76b5d1e4b32d020da0ba3bf1b29
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 18d7300..0b8f67c 100644 (file)
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -63,7 +63,7 @@
     maven:
         maven-name: 'mvn33'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true site'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge site'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'hc2vpp-settings'
         settings-type: cfp
@@ -129,7 +129,7 @@
     maven:
         maven-name: 'mvn33'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'hc2vpp-settings'
         settings-type: cfp
@@ -183,7 +183,7 @@
     maven:
         maven-name: 'mvn33'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'hc2vpp-settings'
         settings-type: cfp
@@ -248,7 +248,7 @@
     maven:
         maven-name: 'mvn33'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'hc2vpp-settings'
         settings-type: cfp

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 91cc148..6135f75 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -59,7 +59,7 @@
     maven:
         maven-name: 'mvn33'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true site'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge site'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'honeycomb-settings'
         settings-type: cfp
@@ -113,7 +113,7 @@
     maven:
         maven-name: 'mvn33'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
         settings: 'honeycomb-settings'
         settings-type: cfp