Make jobs karaf-version specific, some duplicities 97/53797/52
authorVratko Polak <vrpolak@cisco.com>
Thu, 20 Apr 2017 08:07:53 +0000 (10:07 +0200)
committerVratko Polak <vrpolak@cisco.com>
Thu, 20 Apr 2017 08:07:53 +0000 (10:07 +0200)
+ Affected jobs: distribution-check, csit, *patch-test, deploy, offline.
+ Carbon: csit and *patch pick one version, other affected run both.
+ Introduced KARAF_VERSION bash variable.
+ Macro to set that variable.
+ Default value set to 'karaf4'.
+ Pre-carbon branches (and caron temporarily) use 'karaf3'.
+ Karaf version usually configurable per job definition and stream.
+ csit-verify jobs use {verify-karaf-version} from releng defaults.
+ Scripts -bundle-vars, -distribution-check, -deploy, -offline renamed.
+ Macros which include (some of) them also renamed to match.
+ The bundle script sets artifact name and path from karaf version.
+ KARAF_ARTIFACT computed and used instead of distribution-karaf.
+ The part detecting version from nexus moved to separate macro.
+ The nexus upload macro tolerates failures (for Sandbox).
+ The nexus upload macro cats log to console to see attempted URL is ok.
+ High level macros usually call dependent macros (unless duplication).
+ Also they inject their property file right away.
+ BUNDLE_URL and ACTUAL_BUNDLE_URL always with underscores.
- BUNDLEVERSION and BUNDLEFOLDER still without underscores, cause Robot.
+ On yaml side, bundle-url always with dash.
+ concurrent:false for distribution deploy and offline jobs.
+ distribution-jobs moved to jjb/integration/distribution/.
+ Separated distribution-templates (distribution-check moved there)..
+ Simple Yaml string without quotes, unless that looks ugly in lists.
+ Description comments moved inside to not repeat the name.
+ Used by field dropped, Argumens and Required added (TODOs left).
+ Some typos from previous changes corrected.
+ Random bash linting improvements.
- Two carbon distribution-check jobs is a waste, worth fixing?
- Karaf4 bin/client is failing, to be fixed later (affects offline job).
- No alternative to Nexus uploading for Sandbox.
- Releng/Integration/Distribution stuff to be named and placed better.
- Some jobs get KARAF_VERSION even if they do not need that (yet).
- Code de-duplication left for another time.

Change-Id: I85c71a7ea94b9383b932d65b496056865bcecf78
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
228 files changed:
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-idmlite.yaml
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/armoury/armoury-csit-basic.yaml
jjb/armoury/armoury.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap-csit-ac.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel-csit-basic.yaml
jjb/centinel/centinel.yaml
jjb/coe/coe.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-periodic-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim.yaml
jjb/deploy-distribution-get-vars.sh [deleted file]
jjb/deploy-distribution.sh [deleted file]
jjb/didm/didm-csit-discovery.yaml
jjb/didm/didm.yaml
jjb/discovery/discovery.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/eman/eman-csit-model.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/include-raw-deploy-archives.sh
jjb/infrautils/infrautils.yaml
jjb/integration/distribution-deploy-offline.sh [moved from jjb/integration/include-raw-integration-deploy-controller-offline.sh with 59% similarity]
jjb/integration/distribution-deploy-verify.sh [moved from jjb/integration/include-raw-integration-deploy-controller-verify.sh with 60% similarity]
jjb/integration/distribution-jobs.yaml [deleted file]
jjb/integration/distribution/distribution-check.yaml [deleted file]
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml [new file with mode: 0644]
jjb/integration/distribution/distribution-templates.yaml [new file with mode: 0644]
jjb/integration/distribution/distribution.yaml
jjb/integration/include-raw-integration-compare-distributions.sh
jjb/integration/include-raw-integration-configure-clustering.sh
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
jjb/integration/include-raw-integration-get-bundle-vars.sh [deleted file]
jjb/integration/include-raw-integration-start-cluster-run-test.sh
jjb/integration/integration-detect-variables.sh [new file with mode: 0644]
jjb/integration/integration-distribution-check.sh [moved from jjb/integration/include-raw-integration-distribution-check.sh with 58% similarity]
jjb/integration/integration-macros.yaml
jjb/integration/integration-set-variables.sh [new file with mode: 0644]
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/integration-upload-distribution.sh [new file with mode: 0644]
jjb/iotdm/iotdm-csit-basic.yaml
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp-csit-basic.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-cluster-stress.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide-csit-basic.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-legacy-csit-clustering.yaml
jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
jjb/netvirt/netvirt-legacy-csit.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic-csit-basic.yaml
jjb/nic/nic-csit-vtnrenderer.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin-csit-basic.yaml
jjb/ocpplugin/ocpplugin-csit-scalability.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config-csit-basic.yaml
jjb/of-config/of-config.yaml
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
jjb/openflowplugin/openflowplugin-csit-scalability.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp-csit-basic.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-cluster-routing.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/tcpmd5/tcpmd5.yaml
jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr-csit-basic.yaml
jjb/unimgr/unimgr-csit-legato.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc-csit-udp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vpnservice/vpnservice.yaml
jjb/vtn/vtn-csit-3node-manager.yaml
jjb/vtn/vtn-csit-coordinator.yaml
jjb/vtn/vtn-csit-manager.yaml
jjb/vtn/vtn-manager-csit-1node-openstack.yaml
jjb/vtn/vtn-patch-test.yaml
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools.yaml

index 807c912400b707fd9f94b46b68af1589f29bf8e4..7e9c1c2b4dd7bb73bd926f90aaecc223ab8b20f7 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 347af910c891c1c2dafa8c25dbcf5dfd87bba2b4..b9b99b998998fb76f4907e7185fcfff9346ba674 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 80722ca46056c56e32cba8e9334050d85d355d22..4c79a92b9b54d415531ae8361c6f8526c600322c 100644 (file)
@@ -19,6 +19,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 5485dfd9409a0e18feb6a864bc51462682e6c15d..269dc52e6c4c715eeebd5cf945a9cf7124416c90 100644 (file)
@@ -18,6 +18,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index c8850a361f83bf06fdb8406a747a61d517fb852a..b50d7b35b7f24f0a5bb76e39e5a709b7f49d3050 100644 (file)
@@ -15,6 +15,7 @@
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
+          karaf-version: karaf3
 
     feature:
       - authn:
index feb3cb91585d0831ce679a5c876cecde0c8c99c2..010cc886df2d8a2e73dbaadcd0b8073e74220b07 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index a1c337240a7dfc99e5420447202e3abd11781e3b..5042a631608cdb92f3f69f9fa7aeaec7fc01667b 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index ba01d1516b1eecc2cf3b87d57b879cfd22ca174a..99e2fe1d3cbb2fa371f2bd8c06421a543ebaf25f 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 638b914caeb0b460c8bf3107085b2bb93b4771b2..9bfd6f8c03b92ca60b0ce0e5f7ba55994ce45c25 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index e40122df4c2f9e28ac909c485462893cd2ed8f93..85b83efe28243c3d113533362866ca1e0677dd52 100644 (file)
@@ -37,6 +37,7 @@
     project: 'armoury'
     project-name: 'armoury'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk7
@@ -63,6 +64,7 @@
     project: 'armoury'
     project-name: 'armoury'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk7
@@ -89,6 +91,7 @@
     project: 'armoury'
     project-name: 'armoury'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 452f71d4d2ae89080b27cfae7834fb49a385662a..fd36010d1dc770fc003a8161034b447974c96588 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index bc95076cae2d1477f602640cf64a33230d9878d6..f128bd4d323fcb34571f51ee1a6f20597456fbd4 100644 (file)
 - builder:
     name: autorelease-distribute-taglist
     builders:
+      - integration-set-variables
       - shell: |
           if [ -d "integration/distribution/distributions" ]; then
               cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distributions/karaf/src/main/assembly/"
           else
-              cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distribution-karaf/src/main/assembly/"
+              cp -vf "$WORKSPACE/taglist.log" "integration/distribution/$KARAF_ARTIFACT/src/main/assembly/"
           fi
 
 - builder:
 - builder:
     name: autorelease-get-integration-test-variables
     builders:
+      - integration-set-variables
       - shell: !include-raw: include-raw-autorelease-get-integration-test-variables.sh
       - inject:
           properties-file: variables.prop
index fee1e77dfc093c86081ef7c10dbc7c4637041d67..2ca72409b00f7a05cd8e9bde4e56fee20696ee72 100644 (file)
           branch: 'stable/carbon'
           jdk: 'openjdk8'
           integration-test: carbon
+          karaf-version: karaf3
       - boron:
           next-release-tag: Boron-SR4
           branch: 'stable/boron'
           jdk: 'openjdk8'
           integration-test: boron
+          karaf-version: karaf3
       - beryllium:
           # Only run once a week since Beryllium is in maintenance mode
           cron: 'H H * * 0'
@@ -27,6 +29,7 @@
           branch: 'stable/beryllium'
           jdk: 'openjdk7'
           integration-test: beryllium
+          karaf-version: karaf3
 
     project: 'releng/autorelease'
     archive-artifacts: >
@@ -74,6 +77,8 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - autorelease-release-tag:
           release-tag: '{next-release-tag}'
       - autorelease-release-branch:
index c0a15f6c06c834b6a42cec11d3fbbb963e58bd9a..992c1008f1d1046ac6edd17583efb270630c3dd1 100644 (file)
@@ -21,6 +21,8 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - autorelease-release-tag:
           release-tag: '{next-release-tag}'
       - autorelease-release-branch:
@@ -65,7 +67,7 @@
       - autorelease-generate-taglist
       - autorelease-distribute-taglist
       - distribute-build-url:
-          path: 'integration/distribution/distribution-karaf/src/main/assembly'
+          path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
       - autorelease-generate-release-patches
       # In a perfect world projects should be releasing separately and we consume them
       # via a project that pulls the release bits from each project from Nexus.
             condition: FAILED
           - project: 'packaging-build-rpm-master'
             condition: UNSTABLE_OR_BETTER
-            predefined-parameters: DOWNLOAD_URL=$BUNDLEURL
+            predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
             property-file: variables.jenkins-trigger
             fail-on-missing: true
       - opendaylight-infra-shiplogs:
index c948eb48ad5d0676a15ef16ad0ec202c1ba42f33..b90d959a788a8e96db8917d475239a3db424980c 100644 (file)
 NEXUS_STAGING_URL=${ODLNEXUS_STAGING_URL:-$ODLNEXUSPROXY}
 
 NEXUSURL=${NEXUS_STAGING_URL}/content/repositories/
-VERSION=$(grep -m2 '<version>' "${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml" | tail -n1 | awk -F'[<|>]' '/version/ { printf $3 }')
+VERSION=$(grep -m2 '<version>' "${WORKSPACE}/integration/distribution/${KARAF_ARTIFACT}/pom.xml" | tail -n1 | awk -F'[<|>]' '/version/ { printf $3 }')
 echo "VERSION: ${VERSION}"
 STAGING_REPO_ID=$(grep "Created staging repository with ID" "$WORKSPACE/deploy-staged-repository.log" | cut -d '"' -f2)
-BUNDLEURL="${NEXUSURL}/${STAGING_REPO_ID}/org/opendaylight/integration/distribution-karaf/${VERSION}/distribution-karaf-${VERSION}.zip"
+BUNDLE_URL="${NEXUSURL}/${STAGING_REPO_ID}/org/opendaylight/integration/${KARAF_ARTIFACT}/${VERSION}/${KARAF_ARTIFACT}-${VERSION}.zip"
 echo STAGING_REPO_ID="$STAGING_REPO_ID" >> "$WORKSPACE/variables.prop"
-echo BUNDLEURL="$BUNDLEURL" >> "$WORKSPACE/variables.prop"
-echo "BUNDLEURL: ${BUNDLEURL}"
+echo BUNDLE_URL="$BUNDLE_URL" >> "$WORKSPACE/variables.prop"
+echo "BUNDLE_URL: ${BUNDLE_URL}"
 
 # Copy variables.prop to variables.jenkins-trigger so that the end of build
 # trigger can pick up the file as input for triggering downstream jobs.
index 5ae653324a33f64fd0ee73d309814b5a664ec0b3..6a63da2c891d19f163a12dc57c73f047e42fe77c 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-bgpcep-data-change-counter,
@@ -39,6 +41,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-bgpcep-data-change-counter,
           branch: 'master'
           jre: 'openjdk8'
       - carbon:
-          branch: 'satble/carbon'
+          branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-bgpcep-bgp-all,
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-bgpcep-bgp-all,
index 90824d9cb337458b25f4a9b68dcc3ba8b1be90e5..bfb14343158132f73cf6ffa7f83802f006d095e4 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-bgpcep-bgp-all,
index 646e7d754ccd15f1a61173bce8b26b187afed0c5..1ba83774295e024c6238db703906fd8284de36a1 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-netconf-clustered-topology'
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-netconf-clustered-topology'
 
     install:
index fe238d1e24b78f027879b1dcd2d813275330f565..106977fffa830a7c6cb866d8d56df3f391bd0256 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep'
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep'
 
     install:
index 38e2ba0a90565f6b81b6862c38566961d651fc7e..db797632280082a4691cd0d35ee83706b6d51bb2 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-bgpcep-pcep-all,
@@ -35,6 +37,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-bgpcep-pcep-all,
index dcd0281e9eceb9725d783537a5d035f38d19a1f3..f7792a3a9b973ea5db5ef1f6dcc3530f36c56238 100644 (file)
@@ -37,6 +37,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -47,6 +48,7 @@
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -80,6 +82,7 @@
     project-name: 'bgpcep'
     build-node: centos7-java-builder-4c-8g
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
     project: 'bgpcep'
     project-name: 'bgpcep'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index b171973b896d8cd6d3f862c4fb04d5dd2591691f..ac30ab545f47bbae0b8a87a3320fdf6aeb78d666 100644 (file)
@@ -19,6 +19,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     # TODO: Delete the following if suites are compatible with Boron again.
     verify-stream: 'carbon'
index 7406abbfe26ed082422dbc0d7fe6f8cb423427ed..12ad1076a07286abc514d3edbcb4e2a50abf849e 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: bier-nirtogen
+    name: bier-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index 6ec561ddc1feb341e1bbf69c06231cc022e3495f..62294a9451fc0e23bba81c0914debb86a6f97be8 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index f6188adea7be9624d2e04bd447e00cef657f5fe3..a99c63d1a7052b6f93543068e9e697ffa0171834 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 34b2e7e7dadc0c4b3ac656debee6e3643f2f6760..95a20a7cfe9e0cfc5336f1d420e23e75afd227c6 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index 8b965dc8d9e48759c4acb046e224a6fbb2b677ed..ed02d51247e6f5857078cebc6fb27e9a0ac11103 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 373361eb0f204fc976244bdb5c739dadd9307636..fcbbae62b45c3085f90b087381c258262116bfb7 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index c5f74a2ba1f23635060e2d97ad18cc7f39b7a2be..dd495752fbd9dc039132fc0bedd573000cb70f74 100644 (file)
@@ -36,6 +36,7 @@
     project-name: 'coe'
     stream: carbon
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index 9be47634b114f2645751bb94c7cbab3022662485..4bb7e8f2d6000d649329e6fb90a25ec62899c43c 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 9bbdf02bfc4bdbe7a5d5ba355dbf00ff8e42ab58..ba63cef0b2b21476d69c46ac808f750f0ae5f755 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 004b8e7e29cfcdcefce68811895e89ced2827e33..37172087c8756c58778cef469680b04451ee7c58 100644 (file)
@@ -18,6 +18,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 3b72db1e1d964325ea159a2021b24e4a3a660730..6956ceb2c038efc6f7c63eb1108a1216cd0d4c9d 100644 (file)
@@ -18,6 +18,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 6968fd9f366452a8e32a86370fb5ca03a2529403..5a131a293ec30756818c5a88a7c04860e0a36cda 100644 (file)
@@ -18,6 +18,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 0f3dba3867a37ec420a35cac51f8d85b9d813a45..af7ff6109449746401fb951094ae56eb5c049672 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 0e46ca42a24b6602ce2aed84efbd183a837b2408..13f7e0be762d8c887c56c2c2e2f4efffe070fb3c 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index a31451ce17f895a9227be54e907a1c092df07d48..09869279379f2dd1cc8190c7912d60711f0cac50 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index c3dd221adbfdeb7f5ffc4b892416c7d2bae6d141..8710a4602bf3a035d75cd6db96df0a52621dc397 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index dbb2dddbcb7273924ff42117b2bc86d9cf9b5ee7..185482da260b98072587eef850239bd3ddf73ce1 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 09860abbf8910e09248db122d06df855ceecf3ce..367ca6e7f8d66f2a07f7260e854a5117048e8e15 100644 (file)
@@ -36,6 +36,7 @@
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -61,6 +62,7 @@
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -86,6 +88,7 @@
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index cdc5d5a93644916131ce904a5d31a42d9ff80b72..cd0cab21d0eb9805fa679008a7eee8473fe5663a 100644 (file)
@@ -18,8 +18,9 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
           # yamllint disable-line rule:line-length
-          bundleurl: 'https://jenkins.opendaylight.org/releng/view/daexim/job/daexim-merge-carbon/lastSuccessfulBuild/org.opendaylight.daexim$daexim-karaf/artifact/org.opendaylight.daexim/daexim-karaf/1.0.0-SNAPSHOT/daexim-karaf-1.0.0-SNAPSHOT.zip'
+          bundle-url: 'https://jenkins.opendaylight.org/releng/view/daexim/job/daexim-merge-carbon/lastSuccessfulBuild/org.opendaylight.daexim$daexim-karaf/artifact/org.opendaylight.daexim/daexim-karaf/1.0.0-SNAPSHOT/daexim-karaf-1.0.0-SNAPSHOT.zip'
 
     install:
       - only:
index eead0a4fdf35635c4397980b8ee16dd855ae3c00..902fcacf84110ac129f90127db887d864f926c13 100644 (file)
@@ -36,6 +36,7 @@
     project-name: 'daexim'
     stream: carbon
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
diff --git a/jjb/deploy-distribution-get-vars.sh b/jjb/deploy-distribution-get-vars.sh
deleted file mode 100644 (file)
index 8512d62..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -xeu -o pipefail
-
-export BUNDLE
-export BUNDLE_URL
-export BUNDLE_VERSION
-
-BUNDLE_VERSION=$(xpath "${BUNDLE_POM}" '/project/version/text()' 2> /dev/null)
-BUNDLE="distribution-karaf-${BUNDLE_VERSION}.zip"
-BUNDLE_URL="/tmp/r/org/opendaylight/integration/distribution-karaf/${BUNDLE_VERSION}/${BUNDLE}"
-
-# Used to inject BUNDLE_ variables back into Jenkins
-env | grep BUNDLE_ | sort | tee deploy-distribution.env
diff --git a/jjb/deploy-distribution.sh b/jjb/deploy-distribution.sh
deleted file mode 100644 (file)
index 934c3a2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -xeu -o pipefail
-
-echo "Uploading distribution to Nexus..."
-"$MVN" deploy:deploy-file \
-    --log-file deploy-karaf-distribution.log \
-    --global-settings "$GLOBAL_SETTINGS_FILE" \
-    --settings "$SETTINGS_FILE" \
-    -Dfile="$BUNDLE_URL" \
-    -DrepositoryId=opendaylight-snapshot \
-    -Durl="$ODLNEXUSPROXY/content/repositories/opendaylight.snapshot/" \
-    -DgroupId="org.opendaylight.integration.${GERRIT_PROJECT//\//.}" \
-    -DartifactId=distribution-karaf \
-    -Dversion="$BUNDLE_VERSION" \
-    -Dpackaging=zip
-
-BUNDLE_URL=$(grep "Uploaded.*distribution-karaf/$BUNDLE_VERSION.*.zip" deploy-karaf-distribution.log | awk '{print $3}')
-echo "Bundle uploaded to $BUNDLE_URL"
-
-# Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus
-env | grep BUNDLE_ | sort | tee deploy-distribution.env
index f585f48e39144933c428e5a0f4016024fe8ef2b0..615ce277b5ea9b2eea4e6ba52b0d99c2e71625ab 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 6efc1c58b88e5cdce75b05bde329f2bb6da6cec9..a6f1188fa3aca7025d1214def50117dfdb6e4469 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'didm'
     project-name: 'didm'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'didm'
     project-name: 'didm'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'didm'
     project-name: 'didm'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index a7e83e8f11c741a20530f661bf3f32382b56576f..b770c2150a1b0283613795003f5cf91e95729984 100644 (file)
@@ -36,6 +36,7 @@
     project: 'discovery'
     project-name: 'discovery'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
@@ -61,6 +62,7 @@
     project: 'discovery'
     project-name: 'discovery'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
@@ -86,6 +88,7 @@
     project: 'discovery'
     project-name: 'discovery'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 976feec36445043b104601eb3c77c96b93da7ac4..00b31dc6677a1146ecb857bd6f6398273bfa051a 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -93,6 +96,7 @@
     stream: beryllium
     project: 'dlux'
     project-name: 'dlux'
+    karaf-version: karaf3
     branch: 'stable/beryllium'
     jdk: openjdk7
     jdks:
index 0c186f8428f3bf4196efab250152cc5f94810f40..427fd1ba77e62f4303813b2f71627c26905f4809 100644 (file)
@@ -19,6 +19,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 393c2f1a3fed2a2095a74afb8e3731181336ce5d..aaaf1e7c3954ebc1ed4445eea5e49a3e06c845df 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 267503c9d70d92a5968e3459904e1d9fe91e83d5..30db058c6bb98f3470724b4a1030dbe27f8431ad 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index b6bfbf34836741e9a2fb8d98cdf28cf04e784e64..d581efe2e457d73fb8b6682ca19c1add3e63fa43 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'eman'
     project-name: 'eman'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'eman'
     project-name: 'eman'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index 39af4df881d67cdd66bd446267925fd185fe6414..cef10f4edc6c70f3177d541a647042c2c3c9b08a 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index a1ec96b8bf569a5b1f116134bcde8c388e008378..789356b9dfb194816de742af00386e59cc2f2cc9 100644 (file)
@@ -33,6 +33,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
 
@@ -40,6 +41,7 @@
     project-name: 'federation'
     stream: carbon
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index 084f7b1bce64666ea3bfecfd7b6b0ffb4c1df27d..ee0de580b16c26dd90d70084054410efe97e9ae7 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 6cf71d1397912139fa69b67b3de9563272d43306..b4167143f0091f29dd1ed474c7aac561ee01fccd 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'
+          karaf-version: karaf3
 
     feature:
       - netvirt:
index 9fa00f16ed98d255dd7da73cde879b38a6066f41..5682d12e2579e3f3eb1430d367099721f092686c 100644 (file)
@@ -36,6 +36,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -45,6 +46,7 @@
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -76,6 +78,7 @@
     stream: boron
     project: 'genius'
     project-name: 'genius'
+    karaf-version: karaf3
     branch: 'stable/boron'
     jdk: openjdk8
     jdks:
index e38eabadc5fee84b9d4d7651c095192b41177b58..652bfd52445132794731d6eb3009e3552eb636be 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
 
     openstack:
index 8c5c5e798d87c87cd4be299b5ff5fae61e479b44..1572c351122858c2ca4b4c32d5eee4a3efd45f0b 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index e7009e39041c31a819e3a45c1bcfb3809ecd47cc..bf8b007676309729e345a084672d0b9a19233c46 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index f575d645671ab1ad99cb978a287a980b13df6eea..c69f567062a8ca2ec17a784d280ff8ecece07e2b 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index a4b6bdfefdd2bd2539d3000ac357060f9e1529b2..e818a669acded5446c419244acafde775b7325d9 100644 (file)
@@ -17,6 +17,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index f09f9998bbec22b0896119cebdbaac46ea85bb5b..6b5b7805d2f3469de9cf1a461fe934ad8ff385e7 100644 (file)
@@ -36,6 +36,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -45,6 +46,7 @@
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -77,6 +79,7 @@
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 2b0d709ce4d6bd37a6eb11d524b4bb690d2c93eb..2e8f863db8e2c2b414459015d6e7fdcff380251c 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index 156894f3ee358d092e8bf2c86940fd87174b631d..134db192844c45222ce16871a9bdc863b980b8d8 100644 (file)
@@ -78,7 +78,7 @@ if [ ! -z "$ARCHIVE_ARTIFACTS" ]; then
     for f in $ARCHIVE_ARTIFACTS; do
         [[ -e $f ]] || continue  # handle the case of no files to archive
         echo "Archiving $f" >> "$WORKSPACE/.archives/$ARCHIVES_DIR/_archives.log"
-        dir=$(dirname "$f")
+        dir="$(dirname "$f")"
         mkdir -p "$WORKSPACE/archives/$dir"
         mv "$f" "$WORKSPACE/archives/$f"
     done
index 575a9fa6ac5168752e1f1dfdf1ecf99d8c97dc76..97a2d5f678bc2df52401942898e765f120c111dc 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
similarity index 59%
rename from jjb/integration/include-raw-integration-deploy-controller-offline.sh
rename to jjb/integration/distribution-deploy-offline.sh
index bc525171f46ffeafdce86692d40a613eec67ccf6..c71eecb8ea2a7777ca2da6e0797383785c73a293 100644 (file)
@@ -8,44 +8,48 @@ echo "Clean workspace"
 rm -rf *
 
 echo "Downloading the distribution..."
-wget --progress=dot:mega ${ACTUALBUNDLEURL}
+wget --progress=dot:mega "${ACTUAL_BUNDLE_URL}"
 
 echo "Extracting the new controller..."
-unzip -q ${BUNDLE}
+unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
-FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" ${FEATURESCONF}
-cat ${FEATURESCONF}
+FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
+# Add test feature repo if Karaf 4.
+sed -ie "s%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+# Add test feature repo if Karaf 3.
+sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+# Feature is instaled later.
+cat "${FEATURESCONF}"
 
 echo "Configuring the log..."
-LOGCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' ${LOGCONF}
+LOGCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg"
+sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' "${LOGCONF}"
 # FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' ${LOGCONF}
-cat ${LOGCONF}
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' "${LOGCONF}"
+cat "${LOGCONF}"
 
 echo "Configure the repos..."
-REPOCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
-sed -ie '/http/d' ${REPOCONF}
-sed -ie '$s/...$//' ${REPOCONF}
-cat ${REPOCONF}
+REPOCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg"
+sed -ie '/http/d' "${REPOCONF}"
+sed -ie '$s/...$//' "${REPOCONF}"
+cat "${REPOCONF}"
 
 echo "Configure max memory..."
-MEMCONF=${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv
-sed -ie "s/2048m/${CONTROLLERMEM}/g" ${MEMCONF}
-cat ${MEMCONF}
+MEMCONF="${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv"
+sed -ie "s/2048m/${CONTROLLERMEM}/g" "${MEMCONF}"
+cat "${MEMCONF}"
 
-if [ ${JDKVERSION} == 'openjdk8' ]; then
+if [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
     # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.8.0
-elif [ ${JDKVERSION} == 'openjdk7' ]; then
+    export JAVA_HOME='/usr/lib/jvm/java-1.8.0'
+elif [ "${JDKVERSION}" == 'openjdk7' ]; then
     echo "Setting the JRE Version to 7"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
     # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.7.0
+    export JAVA_HOME='/usr/lib/jvm/java-1.7.0'
 fi
 readlink -e "${JAVA_HOME}/bin/java"
 echo "Default JDK Version, JAVA_HOME should override"
@@ -61,7 +65,7 @@ echo "Sleeping 30 seconds to make sure Karaf ssh has started..."
 sleep 30
 
 echo "Installing all features..."
-sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf "feature:install ${ACTUALFEATURES}" || echo $? > ${WORKSPACE}/error.txt
+sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf "feature:install ${ACTUALFEATURES}" || echo $? > "${WORKSPACE}/error.txt"
 
 echo "killing karaf process..."
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
@@ -69,11 +73,11 @@ sleep 5
 
 echo "Fetching Karaf logs"
 # TODO: Move instead of copy? Gzip?
-cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
-cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
+cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
+cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
 
 echo "Exit with error"
-if [ -f ${WORKSPACE}/error.txt ]; then
+if [ -f "${WORKSPACE}/error.txt" ]; then
     echo "Failed to deploy offline"
     exit 1
 fi
similarity index 60%
rename from jjb/integration/include-raw-integration-deploy-controller-verify.sh
rename to jjb/integration/distribution-deploy-verify.sh
index bd74574dabdb29540cc0fa8a5a0b90a8ef019e61..193d1f944a6f4e402bded9343cd133a8e483bae0 100644 (file)
@@ -8,40 +8,44 @@ echo "Clean workspace"
 rm -rf *
 
 echo "Downloading the distribution..."
-wget --progress=dot:mega  ${ACTUALBUNDLEURL}
+wget --progress=dot:mega  "${ACTUAL_BUNDLE_URL}"
 
 echo "Extracting the new controller..."
-unzip -q ${BUNDLE}
+unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
 FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" ${FEATURESCONF}
-cat ${FEATURESCONF}
+# Add test feature repo if Karaf 4.
+sed -ie "s%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+# Add test feature repo if Karaf 3.
+sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+# Add actual boot features.
+sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
+cat "${FEATURESCONF}"
 
 echo "Configuring the log..."
-LOGCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' ${LOGCONF}
-cat ${LOGCONF}
+LOGCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg"
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' "${LOGCONF}"
+cat "${LOGCONF}"
 
 echo "Configure max memory..."
-MEMCONF=${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv
-sed -ie "s/2048m/${CONTROLLERMEM}/g" ${MEMCONF}
-cat ${MEMCONF}
+MEMCONF="${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv"
+sed -ie "s/2048m/${CONTROLLERMEM}/g" "${MEMCONF}"
+cat "${MEMCONF}"
 
 echo "Listing all open ports on controller system"
 netstat -pnatu
 
-if [ ${JDKVERSION} == 'openjdk8' ]; then
+if [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
     # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.8.0
-elif [ ${JDKVERSION} == 'openjdk7' ]; then
+    export JAVA_HOME='/usr/lib/jvm/java-1.8.0'
+elif [ "${JDKVERSION}" == 'openjdk7' ]; then
     echo "Setting the JRE Version to 7"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
     # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.7.0
+    export JAVA_HOME='/usr/lib/jvm/java-1.7.0'
 fi
 readlink -e "${JAVA_HOME}/bin/java"
 echo "Default JDK Version, JAVA_HOME should override"
@@ -56,22 +60,22 @@ ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 echo "Waiting for controller to come up..."
 COUNT=0
 while true; do
-    RESP="$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true )"
-    echo ${RESP}
-    if [[ ${RESP} == *"200"* ]]; then
+    RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
+    echo "${RESP}"
+    if [[ "${RESP}" == *"200"* ]]; then
         echo Controller is UP
         break
-    elif (( ${COUNT} > 600 )); then
+    elif (( "${COUNT}" > 600 )); then
         echo Timeout Controller DOWN
         echo "Dumping Karaf log..."
-        cat ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
+        cat "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Listing all open ports on controller system"
         netstat -pnatu
         exit 1
     else
-        COUNT=$(( ${COUNT} + 5 ))
+        COUNT="$(( ${COUNT} + 5 ))"
         sleep 5
-        echo waiting ${COUNT} secs...
+        echo "waiting ${COUNT} secs..."
     fi
 done
 
@@ -87,26 +91,26 @@ netstat -pnatu
 
 function exit_on_log_file_message {
     echo "looking for \"$1\" in karaf.log file"
-    if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log; then
+    if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
         echo ABORTING: found "$1"
         echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
+        head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
-        cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
-        cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
+        tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
+        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
+        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
         exit 1
     fi
 
     echo "looking for \"$1\" in karaf_console.log file"
-    if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log; then
+    if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"; then
         echo ABORTING: found "$1"
         echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
+        head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
         echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
-        cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
-        cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
+        tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
+        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
         exit 1
     fi
 }
@@ -116,13 +120,13 @@ exit_on_log_file_message 'server is unhealthy'
 
 echo "Fetching Karaf logs"
 # TODO: Move instead of copy? Gzip?
-cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
-cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
+cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
+cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
 
 echo "Kill controller"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 
-echo "Detecting misplaced config files"
+echo "Bug 4628: Detecting misplaced config files"
 pushd "${WORKSPACE}/${BUNDLEFOLDER}"
 XMLS_FOUND=`echo *.xml`
 popd
diff --git a/jjb/integration/distribution-jobs.yaml b/jjb/integration/distribution-jobs.yaml
deleted file mode 100644 (file)
index c54c64c..0000000
+++ /dev/null
@@ -1,315 +0,0 @@
----
-- project:
-    name: distribution-jobs
-    jobs:
-      - '{project-name}-verify-python-{stream}'
-      - 'distribution-verify-{stream}'
-      - 'distribution-merge-{stream}'
-      - 'distribution-deploy-{stream}'
-      - 'distribution-offline-{stream}'
-
-    project: integration/distribution
-    project-name: distribution
-
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-
-
-- job-template:
-    name: 'distribution-verify-{stream}'
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-    jdk: '{jre}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
-      - integration-patch-refspec:
-          branch: '$GERRIT_REFSPEC'
-      - maven-exec:
-          maven-version: mvn33
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$PATCHREFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - wipe-org-opendaylight-repo
-      - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
-          settings-file: 'integration-settings'
-      - maven-target:
-          maven-version: mvn33
-          pom: pom.xml
-          goals: |
-              clean install dependency:tree -DoutputFile=dependency_tree.txt
-              -Dstream={stream}
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m'
-          settings: integration-settings
-          settings-type: cfp
-          global-settings: odl-global-settings
-          global-settings-type: cfp
-      - distribution-check-deploy-distribution:
-          dist-pom: pom.xml
-      - trigger-builds:
-          - project: 'distribution-deploy-{stream}'
-            block: true
-            predefined-parameters:
-              BUNDLEURL=$BUNDLE_URL
-
-    publishers:
-      - findbugs
-      - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
-
-
-- job-template:
-    name: 'distribution-merge-{stream}'
-
-    # Need to keep jobs that deploy to Nexus at end of build as Maven
-    # projects. Maybe reconsider this once upstream moves deploy to a
-    # separate lifecycle:
-    #     https://issues.apache.org/jira/browse/MNG-5666
-
-    project-type: maven
-    node: '{build-node}'
-    jdk: '{jre}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof **/target/surefire-reports/*-output.txt'
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
-          name: 'integration/distribution'
-          branch: '{branch}'
-
-    prebuilders:
-      - wipe-org-opendaylight-repo
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
-          settings-file: 'integration-settings'
-      - distribute-build-url:
-          path: 'distribution-karaf/src/main/assembly'
-
-    maven:
-      maven-name: 'mvn33'
-      root-pom: 'pom.xml'
-      goals: >
-          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
-          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-          -Djenkins -Dmerge -Dstream={stream}
-      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-      settings: 'integration-settings'
-      settings-type: cfp
-      global-settings: 'odl-global-settings'
-      global-settings-type: cfp
-
-    postbuilders:
-      - conditional-step:
-          condition-kind: file-exists
-          condition-filename: deploy-site.xml
-          condition-basedir: workspace
-
-          # The strategy here is intentional to run Maven site:deploy twice
-          # once using regular pom.xml to produce a staged-site which is
-          # then used by deploy-site.xml to push to Nexus. This is a
-          # workaround to Maven Site's default linking code which creates
-          # incorrect URLs for sites due to auto-detection assuming your
-          # project is configured in a certain way which ODL is not.
-          steps:
-            - maven-target:
-                maven-version: 'mvn33'
-                pom: pom.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                  - '-Xmx2g'
-                settings: 'integration-settings'
-                settings-type: cfp
-                global-settings: 'odl-global-settings'
-                global-settings-type: cfp
-            - maven-target:
-                maven-version: 'mvn33'
-                pom: deploy-site.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                  - '-Xmx2g'
-                settings: 'integration-settings'
-                settings-type: cfp
-                global-settings: 'odl-global-settings'
-                global-settings-type: cfp
-      - integration-compare-distributions
-    # TODO: the output of the above command is not *friendly* for the reader because the most important info
-    # is listed last. This is fine/best for command line output, but for keeping in a file it would be better
-    # to put the summary at the beginning of the file. Some bash magic can be done here to make that happen.
-
-    reporters:
-      - findbugs
-
-    publishers:
-      - maven-deploy:
-          id: ''
-          unique-version: true
-          deploy-unstable: false
-      - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
-
-# Template: distribution-deploy-{stream}
-# Goal: Verify distribution starts with no issues when all features are loaded
-# Operation: This job deploys the controller installing odl-integration-all
-
-- job-template:
-    name: 'distribution-deploy-{stream}'
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/*.hprof'
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - timed: 'H H * * *'
-
-    builders:
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
-      - integration-deploy-controller-verify
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
-      - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-# Template: distribution-offline-{stream}
-# Goal: Verify distribution can start with no internet connection
-# Operation: This job deploys the controller removing any external repository definition
-
-- job-template:
-    name: 'distribution-offline-{stream}'
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/*.hprof'
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - timed: 'H H * * *'
-
-    builders:
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
-      - integration-deploy-controller-offline
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
-      - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
diff --git a/jjb/integration/distribution/distribution-check.yaml b/jjb/integration/distribution/distribution-check.yaml
deleted file mode 100644 (file)
index 4a69d36..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
----
-- job-template:
-    # Template: distribution-check-{stream}
-    # Goal: Build a patch and make sure it would not break distribution-check jobs for other projects.
-    # Operation: FIXME
-    #            This job template builds a patch, creates a distribution containing
-    #            the patch (making sure dependencies are specified),
-    #            and performs the distribution deploy test.
-
-    name: 'distribution-check-{stream}'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-      - maven-exec:
-          maven-version: mvn33
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'distribution'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          # Distro-check jobs typically run within 10 - 30 minutes
-          # with 45 minutes being the occassional edge case.
-          # enforce a 60 minute limit to ensure stuck jobs get
-          # cleared up sooner.
-          build-timeout: '60'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - distribution-check-wipe
-      - distribution-check-build-project:
-          pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-verify-groupid:
-          gerrit-project: 'integration'
-      - distribution-check-delete-snapshots
-      - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-deploy-distribution:
-          dist-pom: distribution/pom.xml
-      - integration-distribution-check
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - postbuildscript:
-          builders:
-            - shell: |
-                #!/bin/bash
-                mkdir -p $WORKSPACE/archives
-                cp karaf*.log $WORKSPACE/archives
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
index f2e5f6b494ce7b2c8ddb47a01a1ecb8e5b273837..756341427a7792e89610a1cf814ae1f9e35bf464 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
           robot-options: '-v USE_NETCONF_CONNECTOR:True'
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
           robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
new file mode 100644 (file)
index 0000000..4790f14
--- /dev/null
@@ -0,0 +1,537 @@
+---
+- project:
+    name: distribution-jobs
+
+- job-template:
+    name: 'distribution-verify-{stream}'
+
+    project-type: maven
+    node: centos7-java-builder-2c-8g
+    concurrent: true
+    jdk: '{jre}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
+      - integration-patch-refspec:
+          branch: '$GERRIT_REFSPEC'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$PATCHREFSPEC'
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    prebuilders:
+      - wipe-org-opendaylight-repo
+      - provide-maven-settings:
+          global-settings-file: 'odl-global-settings'
+          settings-file: 'integration-settings'
+
+    maven:
+      maven-name: 'mvn33'
+      root-pom: 'pom.xml'
+      goals: >
+          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
+          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          -Djenkins -Dstream={stream}
+      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      settings: 'integration-settings'
+      settings-type: cfp
+      global-settings: 'odl-global-settings'
+      global-settings-type: cfp
+      ignore-upstream-changes: true
+      post-step-run-condition: 'SUCCESS'
+
+    reporters:
+      - findbugs
+
+    publishers:
+      - jacoco-report
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
+
+- job-template:
+    name: 'distribution-merge-{stream}'
+
+    # Need to keep jobs that deploy to Nexus at end of build as Maven
+    # projects. Maybe reconsider this once upstream moves deploy to a
+    # separate lifecycle:
+    #     https://issues.apache.org/jira/browse/MNG-5666
+
+    project-type: maven
+    node: '{build-node}'
+    jdk: '{jre}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof **/target/surefire-reports/*-output.txt'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server-name: '{server-name}'
+          name: 'integration/distribution'
+          branch: '{branch}'
+
+    prebuilders:
+      - wipe-org-opendaylight-repo
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'odl-global-settings'
+          settings-file: 'integration-settings'
+      - integration-set-variables
+      - distribute-build-url:
+          path: '$KARAF_ARTIFACT/src/main/assembly'
+
+    maven:
+      maven-name: 'mvn33'
+      root-pom: 'pom.xml'
+      goals: >
+          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
+          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          -Djenkins -Dmerge -Dstream={stream}
+      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      settings: 'integration-settings'
+      settings-type: cfp
+      global-settings: 'odl-global-settings'
+      global-settings-type: cfp
+
+    postbuilders:
+      - conditional-step:
+          condition-kind: file-exists
+          condition-filename: deploy-site.xml
+          condition-basedir: workspace
+
+          # The strategy here is intentional to run Maven site:deploy twice
+          # once using regular pom.xml to produce a staged-site which is
+          # then used by deploy-site.xml to push to Nexus. This is a
+          # workaround to Maven Site's default linking code which creates
+          # incorrect URLs for sites due to auto-detection assuming your
+          # project is configured in a certain way which ODL is not.
+          steps:
+            - maven-target:
+                maven-version: 'mvn33'
+                pom: pom.xml
+                goals: 'site:deploy -V -B -Dstream={stream}'
+                java-opts:
+                  - '-Xmx2g'
+                settings: 'integration-settings'
+                settings-type: cfp
+                global-settings: 'odl-global-settings'
+                global-settings-type: cfp
+            - maven-target:
+                maven-version: 'mvn33'
+                pom: deploy-site.xml
+                goals: 'site:deploy -V -B -Dstream={stream}'
+                java-opts:
+                  - '-Xmx2g'
+                settings: 'integration-settings'
+                settings-type: cfp
+                global-settings: 'odl-global-settings'
+                global-settings-type: cfp
+      - integration-compare-distributions
+    # TODO: the output of the above command is not *friendly* for the reader because the most important info
+    # is listed last. This is fine/best for command line output, but for keeping in a file it would be better
+    # to put the summary at the beginning of the file. Some bash magic can be done here to make that happen.
+
+    reporters:
+      - findbugs
+
+    publishers:
+      - maven-deploy:
+          id: ''
+          unique-version: true
+          deploy-unstable: false
+      - jacoco-report
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
+
+- job-template:
+    name: 'distribution-check-{stream}'
+    # Like a {project}-distribution-check, but one step less as there is no upstream project involved.
+    disabled: false
+
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: true
+    jdk: '{jdk}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - maven-exec:
+          maven-version: mvn33
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: 'distribution'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          # Distro-check jobs typically run within 10 - 30 minutes
+          # with 45 minutes being the occassional edge case.
+          # enforce a 60 minute limit to ensure stuck jobs get
+          # cleared up sooner.
+          # Double that as Karaf 3+4 may take longer.
+          build-timeout: '120'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    builders:
+      - distribution-check-wipe
+      - distribution-check-build-project:
+          pom: 'distribution/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - distribution-check-verify-groupid:
+          gerrit-project: 'integration'
+      - distribution-check-delete-snapshots
+      - distribution-check-configure-remotes
+      - distribution-check-repeat-build:
+          dist-pom: 'distribution/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - integration-upload-distribution:
+          dist-pom: distribution/pom.xml
+      - integration-distribution-check
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - postbuildscript:
+          builders:
+            - shell: |
+                #!/bin/bash
+                mkdir -p $WORKSPACE/archives
+                cp karaf*.log $WORKSPACE/archives
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          mark-unstable-if-failed: true
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+
+- job-template:
+    name: 'distribution-deploy-{stream}'
+    # Goal: Verify distribution starts with no issues when all features are loaded.
+    # Operation: This job deploys the controller installing odl-integration-all.
+    # FIXME: List required variables.
+
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
+    concurrent: false
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/*.hprof'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
+
+    builders:
+      - distribution-deploy-verify
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
+      - integration-csit-archive-build
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+
+- job-template:
+    name: 'distribution-offline-{stream}'
+    # Goal: Verify distribution can start with no internet connection.
+    # Operation: This job deploys the controller removing any external repository definition.
+    # FIXME: List required variables.
+
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
+    concurrent: false
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/*.hprof'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
+
+    builders:
+      - distribution-deploy-offline
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
+      - integration-csit-archive-build
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+
+# Delete these when Karaf 4 becomes Carbon default.
+
+# TODO: Is there a way to de-duplicate with generic template parts?
+
+- job-template:
+    name: 'distribution4-check-carbon'
+    disabled: false
+
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: true
+    jdk: '{jdk}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: stable/carbon
+          refspec: refs/heads/stable/carbon
+          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
+      - distribution-karaf-version:
+          karaf-version: karaf4
+      - maven-exec:
+          maven-version: mvn33
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: distribution
+          refspec: '$GERRIT_REFSPEC'
+          branch: stable/carbon
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          # Distro-check jobs typically run within 10 - 30 minutes
+          # with 45 minutes being the occassional edge case.
+          # enforce a 60 minute limit to ensure stuck jobs get
+          # cleared up sooner.
+          # Double that as Karaf 3+4 may take longer.
+          build-timeout: '120'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: 'stable/carbon'
+          files: '**'
+
+    builders:
+      - distribution-check-wipe
+      - distribution-check-build-project:
+          pom: 'distribution/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - distribution-check-verify-groupid:
+          gerrit-project: 'integration'
+      - distribution-check-delete-snapshots
+      - distribution-check-configure-remotes
+      - distribution-check-repeat-build:
+          dist-pom: 'distribution/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - integration-upload-distribution:
+          dist-pom: distribution/pom.xml
+      - integration-distribution-check
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - postbuildscript:
+          builders:
+            - shell: |
+                #!/bin/bash
+                mkdir -p $WORKSPACE/archives
+                cp karaf*.log $WORKSPACE/archives
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          mark-unstable-if-failed: true
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+
+- job-template:
+    name: 'distribution4-deploy-carbon'
+    disabled: false
+
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
+    concurrent: false
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: 'stable/carbon'
+          refspec: 'refs/heads/stable/carbon'
+          artifacts: '{archive-artifacts} **/*.hprof'
+      - integration-distribution-branch:
+          branch: 'stable/carbon'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: karaf4
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
+
+    builders:
+      - distribution-deploy-verify
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
+      - integration-csit-archive-build
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+
+- job-template:
+    name: 'distribution4-offline-carbon'
+    disabled: false
+
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
+    concurrent: false
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: 'stable/carbon'
+          refspec: 'refs/heads/stable/carbon'
+          artifacts: '{archive-artifacts} **/*.hprof'
+      - integration-distribution-branch:
+          branch: 'stable/carbon'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: karaf4
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
+
+    builders:
+      - distribution-deploy-offline
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
+      - integration-csit-archive-build
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
new file mode 100644 (file)
index 0000000..b564431
--- /dev/null
@@ -0,0 +1,182 @@
+---
+- project:
+    name: distribution-templates
+
+- job-template:
+    name: '{project-name}-distribution-check-{stream}'
+    # Operation: This job template builds a patch, creates a distribution containing
+    #            the patch (making sure dependencies are specified),
+    #            and performs the distribution deploy test.
+    disabled: false
+
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: true
+    jdk: '{jdk}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
+      - integration-distribution-git-url:
+          git-url: '{git-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - maven-exec:
+          maven-version: mvn33
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: '$GERRIT_PROJECT'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+      - integration-distribution-scm:
+          branch: '{distribution_branch}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          # Distro-check jobs typically run within 10 - 30 minutes
+          # with 45 minutes being the occassional edge case.
+          # enforce a 60 minute limit to ensure stuck jobs get
+          # cleared up sooner.
+          # Double that as Karaf 3+4 may take longer.
+          build-timeout: '120'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    builders:
+      - distribution-check-wipe
+      - distribution-check-build-project:
+          pom: '$GERRIT_PROJECT/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - distribution-check-verify-groupid:
+          gerrit-project: '$GERRIT_PROJECT'
+      - distribution-check-download-deps:
+          dist-pom: 'distribution/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - distribution-check-delete-snapshots
+      - distribution-check-configure-remotes
+      - distribution-check-repeat-build:
+          dist-pom: 'distribution/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - integration-upload-distribution:
+          dist-pom: distribution/pom.xml
+      - integration-distribution-check
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - postbuildscript:
+          builders:
+            - shell: |
+                #!/bin/bash
+                mkdir -p $WORKSPACE/archives
+                cp karaf*.log $WORKSPACE/archives
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          mark-unstable-if-failed: true
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+
+# Delete these when Karaf 4 becomes Carbon default.
+
+# TODO: Is there a way to de-duplicate with generic template parts?
+
+- job-template:
+    name: '{project-name}-distribution4-check-carbon'
+    disabled: false
+
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: true
+    jdk: '{jdk}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: 'stable/carbon'
+          refspec: 'refs/heads/stable/carbon'
+          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
+      - integration-distribution-git-url:
+          git-url: '{git-url}'
+      - distribution-karaf-version:
+          karaf-version: karaf4
+      - maven-exec:
+          maven-version: mvn33
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: '$GERRIT_PROJECT'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
+      - integration-distribution-scm:
+          branch: 'stable/carbon'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          # Distro-check jobs typically run within 10 - 30 minutes
+          # with 45 minutes being the occassional edge case.
+          # enforce a 60 minute limit to ensure stuck jobs get
+          # cleared up sooner.
+          # Double that as Karaf 3+4 may take longer.
+          build-timeout: '120'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: 'stable/carbon'
+          files: '**'
+
+    builders:
+      - distribution-check-wipe
+      - distribution-check-build-project:
+          pom: '$GERRIT_PROJECT/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - distribution-check-verify-groupid:
+          gerrit-project: '$GERRIT_PROJECT'
+      - distribution-check-download-deps:
+          dist-pom: 'distribution/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - distribution-check-delete-snapshots
+      - distribution-check-configure-remotes
+      - distribution-check-repeat-build:
+          dist-pom: 'distribution/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+      - integration-upload-distribution:
+          dist-pom: distribution/pom.xml
+      - integration-distribution-check
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - postbuildscript:
+          builders:
+            - shell: |
+                #!/bin/bash
+                mkdir -p $WORKSPACE/archives
+                cp karaf*.log $WORKSPACE/archives
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          mark-unstable-if-failed: true
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
index b9ff74d8af2246c9edc2dfb3213e5b15154e2231..9c58a98d5a848cf427e9aa68aa8daec727efb37e 100644 (file)
@@ -3,37 +3,39 @@
 - project:
     name: distribution
     jobs:
+      # {project-name}- is generic template, distribution- is project specific.
       - '{project-name}-clm-{stream}'
       - '{project-name}-sonar'
       - '{project-name}-validate-autorelease-{stream}'
-      - distribution-check-{stream}
+      - '{project-name}-verify-tox-{stream}'
+      - 'distribution-merge-{stream}'
+      - 'distribution-verify-{stream}'
+      - 'distribution-deploy-{stream}'
+      - 'distribution-offline-{stream}'
+      - 'distribution-check-{stream}'
+      - 'distribution4-deploy-carbon'
+      - 'distribution4-offline-carbon'
+      - 'distribution4-check-carbon'
+
+    project: integration/distribution
+    project-name: distribution
+    mvn-settings: integration-distribution-settings
+    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[int/dist]'
+    jdk: openjdk8
+    jre: openjdk8
 
     stream:
       - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
+          branch: master
       - carbon:
-          branch: 'stable/carbon'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
+          branch: stable/carbon
+          karaf-version: karaf3
       - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
+          branch: stable/boron
+          karaf-version: karaf3
       - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-            - openjdk7
-
-    project: 'integration/distribution'
-    project-name: 'distribution'
-    mvn-settings: 'integration-distribution-settings'
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[int/dist]'
-    archive-artifacts: '**/dependency_tree.txt'
+          branch: stable/beryllium
+          karaf-version: karaf3
index ecd77675f6d7159bc0b57d801921191173d2d29c..af4d2e8826673e7f014791c95f7b8f679e8bcc5e 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Depends on variables created and published from the get-bundle-vars script
+# Depends on variables created and published from the integration-set-variables script
 
 # Do not fail the build if there is trouble trying to collect distribution patch diffs
 set +e
@@ -16,7 +16,7 @@ wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f
 BUNDLEVERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null)
 echo "Bundle version is ${BUNDLEVERSION}"
 # Acquire the timestamp information from maven-metadata.xml
-NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/distribution-karaf"
+NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/${KARAF_ARTIFACT}"
 wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
 
 if [ $? -ne 0 ]; then
@@ -27,19 +27,19 @@ fi
 less maven-metadata.xml
 TIMESTAMP=$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)
 echo "Nexus timestamp is ${TIMESTAMP}"
-BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
-BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
-ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
+BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
+ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
 
-wget --progress=dot:mega $ACTUALBUNDLEURL
+wget --progress=dot:mega $ACTUAL_BUNDLE_URL
 echo "Extracting the last distribution found on nexus..."
 unzip -q $BUNDLE
 mv $BUNDLEFOLDER /tmp/distro_old
 rm $BUNDLE
 
 echo "Extracting the distribution just created by this job..."
-NEW_DISTRO=$(find $WORKSPACE -name distribution-karaf*.zip)
-NEW_DISTRO_BASENAME=$(basename $NEW_DISTRO)
+NEW_DISTRO="$(find $WORKSPACE -name ${KARAF_ARTIFACT}*.zip)"
+NEW_DISTRO_BASENAME="$(basename "$NEW_DISTRO")"
 cp $NEW_DISTRO /tmp/
 cd /tmp/
 # get the name of the folder which will be extracted to
@@ -54,5 +54,5 @@ mkdir -p $WORKSPACE/archives
 # The file/report to be archived will only list the distribution in the comparison and the patches that
 # are different.
 python distcompare.py -r ssh://jenkins-$SILO@git.opendaylight.org:29418 | tee /tmp/dist_diff.txt
-echo -e "Patch differences listed are in comparison to:\n\t$ACTUALBUNDLEURL\n\n" > $WORKSPACE/archives/distribution_differences.txt
+echo -e "Patch differences listed are in comparison to:\n\t$ACTUAL_BUNDLE_URL\n\n" > $WORKSPACE/archives/distribution_differences.txt
 sed -ne '/Patch differences/,$ p' /tmp/dist_diff.txt >> $WORKSPACE/archives/distribution_differences.txt
index bad2f75833d219269c2d61b4ac596777a638a717..ed8e67096ab05e6ba34c63bfe76f1181815e2536 100644 (file)
@@ -63,8 +63,8 @@ cat > ${WORKSPACE}/configuration-script.sh <<EOF
 echo "Changing to /tmp"
 cd /tmp
 
-echo "Downloading the distribution from ${ACTUALBUNDLEURL}"
-wget --progress=dot:mega  '${ACTUALBUNDLEURL}'
+echo "Downloading the distribution from ${ACTUAL_BUNDLE_URL}"
+wget --progress=dot:mega  '${ACTUAL_BUNDLE_URL}'
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
index 5dd16bb0d5211ac09cb1efe3f21d1da6bd3f51cc..b20f1ad570c7203a58a3c14d0f100a1af4f38860 100644 (file)
@@ -43,7 +43,7 @@ echo "Changing to /tmp"
 cd /tmp
 
 echo "Downloading the distribution..."
-wget --progress=dot:mega '${ACTUALBUNDLEURL}'
+wget --progress=dot:mega '${ACTUAL_BUNDLE_URL}'
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
@@ -249,7 +249,7 @@ do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}"
     echo "Lets's take the karaf thread dump"
-    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep ${KARAF_ARTIFACT} | grep -v grep | tr -s ' ' | cut -f2 -d' '")
     ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log || true
 done
 
@@ -273,7 +273,7 @@ SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' '
 
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
--v JAVA_HOME:${JAVA_HOME} -v BUNDLE_URL:${ACTUALBUNDLEURL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
+-v JAVA_HOME:${JAVA_HOME} -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
 -v CONTROLLER:${ODL_SYSTEM_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \
 -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \
 -v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
@@ -292,7 +292,7 @@ for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     echo "Lets's take the karaf thread dump again..."
-    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep ${KARAF_ARTIFACT} | grep -v grep | tr -s ' ' | cut -f2 -d' '")
     ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log || true
     echo "Killing ODL"
     set +e  # We do not want to create red dot just because something went wrong while fetching logs.
index 7d3e7963c99dc7f046f32ffce71347e16379b693..d2b182eab7c12d1fc6ea8195afea8e04d622a133 100644 (file)
@@ -8,7 +8,7 @@ source ${ROBOT_VENV}/bin/activate
 echo "showing recent changes that made it in to the distribution used by this job"
 pip install --upgrade urllib3
 python ${WORKSPACE}/test/tools/distchanges/changes.py -d /tmp/distribution_folder \
-                  -u ${ACTUALBUNDLEURL} -b ${DISTROBRANCH} \
+                  -u ${ACTUAL_BUNDLE_URL} -b ${DISTROBRANCH} \
                   -r ssh://jenkins-${SILO}@git.opendaylight.org:29418 || true
 
 echo "#################################################"
@@ -801,7 +801,7 @@ echo "Starting Robot test suites ${SUITES} ..."
 # please add pybot -v arguments on a single line and alphabetized
 pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude \
     -v BUNDLEFOLDER:${BUNDLEFOLDER} \
-    -v BUNDLE_URL:${ACTUALBUNDLEURL} \
+    -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
     -v CONTROLLER_USER:${USER} \
     -v DEVSTACK_DEPLOY_PATH:/opt/stack/devstack \
     -v HA_PROXY_IP:${HA_PROXY_IP} \
diff --git a/jjb/integration/include-raw-integration-get-bundle-vars.sh b/jjb/integration/include-raw-integration-get-bundle-vars.sh
deleted file mode 100644 (file)
index a387e06..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-echo "#################################################"
-echo "##       Inject Global Variables               ##"
-echo "#################################################"
-
-NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
-ODL_NEXUS_REPO=${ODL_NEXUS_REPO:-content/repositories/opendaylight.snapshot}
-GERRIT_PATH=${GERRIT_PATH:-git.opendaylight.org/gerrit}
-DISTROBRANCH=${DISTROBRANCH:-$GERRIT_BRANCH}
-
-if [ ${BUNDLEURL} == 'last' ]; then
-    # Obtain current pom.xml of integration/distribution, correct branch.
-    wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
-    # Extract the BUNDLEVERSION from the pom.xml
-    BUNDLEVERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null)
-    echo "Bundle version is ${BUNDLEVERSION}"
-    # Acquire the timestamp information from maven-metadata.xml
-    NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/distribution-karaf"
-    wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
-    less maven-metadata.xml
-    TIMESTAMP=$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)
-    echo "Nexus timestamp is ${TIMESTAMP}"
-    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
-    BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
-    ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
-else
-    ACTUALBUNDLEURL="${BUNDLEURL}"
-    BUNDLE="${BUNDLEURL##*/}"
-    BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
-    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
-fi
-
-if [ ${JDKVERSION} == 'openjdk8' ]; then
-    echo "Preparing for JRE Version 8"
-    JAVA_HOME="/usr/lib/jvm/java-1.8.0"
-elif [ ${JDKVERSION} == 'openjdk7' ]; then
-    echo "Preparing for JRE Version 7"
-    JAVA_HOME="/usr/lib/jvm/java-1.7.0"
-fi
-
-echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
-echo "Distribution bundle is ${BUNDLE}"
-echo "Distribution bundle version is ${BUNDLEVERSION}"
-echo "Distribution folder is ${BUNDLEFOLDER}"
-echo "Nexus prefix is ${NEXUSURL_PREFIX}"
-echo "Java home is ${JAVA_HOME}"
-
-cat > ${WORKSPACE}/bundle_vars.txt <<EOF
-ACTUALBUNDLEURL=${ACTUALBUNDLEURL}
-BUNDLE=${BUNDLE}
-BUNDLEVERSION=${BUNDLEVERSION}
-BUNDLEFOLDER=${BUNDLEFOLDER}
-NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
-JAVA_HOME=${JAVA_HOME}
-EOF
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
index ab79025604a601de3b80fc9657a4cb7f4dc0cba4..997a6bd1d9d2e84a33195793a500208919e1e6ec 100644 (file)
@@ -86,7 +86,7 @@ do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}"
     echo "Lets's take the karaf thread dump"
-    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep ${KARAF_ARTIFACT} | grep -v grep | tr -s ' ' | cut -f2 -d' '")
     ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log || true
 done
 
@@ -111,7 +111,7 @@ SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} \
--v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUALBUNDLEURL} -v JAVA_HOME:${JAVA_HOME} \
+-v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} -v JAVA_HOME:${JAVA_HOME} \
 -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
 -v CONTROLLER:${ODL_SYSTEM_IP} -v CONTROLLER1:${ODL_SYSTEM_2_IP} -v CONTROLLER2:${ODL_SYSTEM_3_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
 ${odl_variables} -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} -v \
@@ -133,7 +133,7 @@ for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     echo "Lets's take the karaf thread dump again"
-    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep ${KARAF_ARTIFACT} | grep -v grep | tr -s ' ' | cut -f2 -d' '")
     ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log || true
     echo "killing karaf process..."
     ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
diff --git a/jjb/integration/integration-detect-variables.sh b/jjb/integration/integration-detect-variables.sh
new file mode 100644 (file)
index 0000000..009e0fe
--- /dev/null
@@ -0,0 +1,50 @@
+
+# TODO: Document the default values.
+NEXUSURL_PREFIX="${ODLNEXUSPROXY:-https://nexus.opendaylight.org}"
+ODL_NEXUS_REPO="${ODL_NEXUS_REPO:-content/repositories/opendaylight.snapshot}"
+GERRIT_PATH="${GERRIT_PATH:-git.opendaylight.org/gerrit}"
+DISTROBRANCH="${DISTROBRANCH:-$GERRIT_BRANCH}"
+
+if [ ${BUNDLE_URL} == 'last' ]; then
+    # Obtain current pom.xml of integration/distribution, correct branch.
+    wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+    # Extract the BUNDLEVERSION from the pom.xml
+    BUNDLEVERSION="$(xpath pom.xml '/project/version/text()' 2> /dev/null)"
+    echo "Bundle version is ${BUNDLEVERSION}"
+    # Acquire the timestamp information from maven-metadata.xml
+    NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/${KARAF_ARTIFACT}"
+    wget "${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml"
+    less "maven-metadata.xml"
+    TIMESTAMP="$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)"
+    echo "Nexus timestamp is ${TIMESTAMP}"
+    BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
+    BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
+    ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+elif [[ "${BUNDLE_URL}" == *"distribution-check"* ]]; then
+    ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
+    BUNDLE="${BUNDLE_URL##*/}"
+    BUNDLEFOLDER="${BUNDLE//.zip}"
+    BUNDLEVERSION="${BUNDLEFOLDER//$KARAF_ARTIFACT-}"
+else
+    ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
+    BUNDLE="${BUNDLE_URL##*/}"
+    BUNDLEVERSION="$(basename "$(dirname "${BUNDLE_URL}")")"
+    BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
+fi
+
+echo "Distribution bundle URL is ${ACTUAL_BUNDLE_URL}"
+echo "Distribution bundle is ${BUNDLE}"
+echo "Distribution bundle version is ${BUNDLEVERSION}"
+echo "Distribution folder is ${BUNDLEFOLDER}"
+echo "Nexus prefix is ${NEXUSURL_PREFIX}"
+
+# The following is not a shell file, double quotes would be literal.
+cat > "${WORKSPACE}/detect_variables.env" <<EOF
+ACTUAL_BUNDLE_URL=${ACTUAL_BUNDLE_URL}
+BUNDLE=${BUNDLE}
+BUNDLEVERSION=${BUNDLEVERSION}
+BUNDLEFOLDER=${BUNDLEFOLDER}
+NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
+EOF
+
+# vim: ts=4 sw=4 sts=4 et ft=sh :
similarity index 58%
rename from jjb/integration/include-raw-integration-distribution-check.sh
rename to jjb/integration/integration-distribution-check.sh
index 01c6f02db1e1777595f7a5ffab3d0e303765a1d0..bfddce9c0ea7d7a7ab8495fd9c976e09151729e1 100644 (file)
@@ -1,9 +1,10 @@
+
 CONTROLLERMEM="3072m"
 ACTUALFEATURES="odl-integration-all"
-BUNDLEVERSION=`xpath distribution/pom.xml '/project/version/text()' 2> /dev/null`
-BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
+BUNDLEVERSION="$(xpath distribution/pom.xml '/project/version/text()' 2> /dev/null)"
+BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
 BUNDLE="${BUNDLEFOLDER}.zip"
-BUNDLEURL="/tmp/r/org/opendaylight/integration/distribution-karaf/${BUNDLEVERSION}/${BUNDLE}"
+BUNDLE_URL="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLEVERSION}/${BUNDLE}"
 
 echo "Kill any controller running"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
@@ -12,43 +13,47 @@ echo "Clean workspace"
 rm -rf *
 
 echo "Copying the distribution..."
-cp  ${BUNDLEURL} .
+cp "${BUNDLE_URL}" .
 
 echo "Extracting the new controller..."
-unzip -q ${BUNDLE}
+unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
-FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" ${FEATURESCONF}
-cat ${FEATURESCONF}
+FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
+# Add test feature repo if Karaf 4.
+sed -ie "s%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+# Add test feature repo if Karaf 3.
+sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+# Add actual boot features.
+sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
+cat "${FEATURESCONF}"
 
 echo "Configuring the log..."
-LOGCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' ${LOGCONF}
-cat ${LOGCONF}
+LOGCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg"
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' "${LOGCONF}"
+cat "${LOGCONF}"
 
 echo "Configure max memory..."
-MEMCONF=${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv
-sed -ie "s/2048m/${CONTROLLERMEM}/g" ${MEMCONF}
-cat ${MEMCONF}
+MEMCONF="${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv"
+sed -ie "s/2048m/${CONTROLLERMEM}/g" "${MEMCONF}"
+cat "${MEMCONF}"
 
 echo "Listing all open ports on controller system"
 netstat -pnatu
 
 echo "redirected karaf console output to karaf_console.log"
-export KARAF_REDIRECT=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
+export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
 
-if [ ${JDKVERSION} == 'openjdk8' ]; then
+if [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
     # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.8.0
-elif [ ${JDKVERSION} == 'openjdk7' ]; then
+    export JAVA_HOME='/usr/lib/jvm/java-1.8.0'
+elif [ "${JDKVERSION}" == 'openjdk7' ]; then
     echo "Setting the JRE Version to 7"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
     # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME=/usr/lib/jvm/java-1.7.0
+    export JAVA_HOME='/usr/lib/jvm/java-1.7.0'
 fi
 readlink -e "${JAVA_HOME}/bin/java"
 echo "JDK Version should be overriden by JAVA_HOME"
@@ -66,22 +71,22 @@ set +x
 echo "Waiting for controller to come up..."
 COUNT=0
 while true; do
-    RESP="$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true )"
-    echo ${RESP}
-    if [[ ${RESP} == *"200"* ]]; then
+    RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
+    echo "${RESP}"
+    if [[ "${RESP}" == *"200"* ]]; then
         echo Controller is UP
         break
-    elif (( ${COUNT} > 600 )); then
+    elif (( "${COUNT}" > 600 )); then
         echo Timeout Controller DOWN
         echo "Dumping Karaf log..."
-        cat ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
+        cat "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Listing all open ports on controller system"
         netstat -pnatu
         exit 1
     else
-        COUNT=$(( ${COUNT} + 5 ))
+        COUNT="$(( ${COUNT} + 5 ))"
         sleep 5
-        echo waiting ${COUNT} secs...
+        echo waiting "${COUNT}" secs...
     fi
 done
 
@@ -93,7 +98,7 @@ while true; do
     fi
     echo "${COUNT} seconds yet to wait..."
     sleep 10
-    COUNT=$(( ${COUNT} - 10 ))
+    COUNT="$(( ${COUNT} - 10 ))"
 done
 
 # End of repeating operations, enable verbose printing.
@@ -108,26 +113,26 @@ netstat -pnatu
 
 function exit_on_log_file_message {
     echo "looking for \"$1\" in karaf.log file"
-    if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log; then
+    if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
         echo ABORTING: found "$1"
         echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
+        head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
-        cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
-        cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
+        tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
+        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
+        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
         exit 1
     fi
 
     echo "looking for \"$1\" in karaf_console.log file"
-    if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log; then
+    if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"; then
         echo ABORTING: found "$1"
         echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
+        head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
         echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
-        cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
-        cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
+        tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
+        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
         exit 1
     fi
 }
@@ -137,15 +142,15 @@ exit_on_log_file_message 'server is unhealthy'
 
 echo "Fetching Karaf logs"
 # TODO: Move instead of copy? Gzip?
-cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
-cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
+cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
+cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
 
 echo "Kill controller"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 
-echo "Detecting misplaced config files"
+echo "Bug 4628: Detecting misplaced config files"
 pushd "${WORKSPACE}/${BUNDLEFOLDER}"
-XMLS_FOUND=`echo *.xml`
+XMLS_FOUND="$(echo *.xml)"
 popd
 if [ "$XMLS_FOUND" != "*.xml" ]; then
     echo "Bug 4628 confirmed."
index d7204ed8f7247e801c0b249089a5d141dfee1b24..1e9005cd4577218010f5cf60dbd8d771c08ac5ef 100644 (file)
           description: 'Distribution GIT branch'
 
 - parameter:
-    name: integration-bundleurl
+    name: distribution-karaf-version
+    # Arguments:
+    #   karaf-version: Provide, otherwise releng-defaults value is used.
     parameters:
       - string:
-          name: BUNDLEURL
-          default: '{bundleurl}'
+          name: KARAF_VERSION
+          default: '{karaf-version}'
+          description: 'karaf3 or karaf4, affects ODL deploy scripts'
+
+- parameter:
+    name: integration-bundle-url
+    parameters:
+      - string:
+          name: BUNDLE_URL
+          default: '{bundle-url}'
           description: 'URL to karaf distribution zip'
 
 - parameter:
     builders:
       - shell: !include-raw: include-raw-integration-get-slave-addresses.sh
 
-# Macro: integration-get-bundle-vars
-# Operation: this macro gets all bundle related variables
-# Used by: {project}-csit-3node-* job templates
-
 - builder:
-    name: integration-get-bundle-vars
+    name: integration-set-variables
+    # Operation: Construct variables not requiring online detection and export using set_variables.env
+    # Required bash variables:
+    #   KARAF_VERSION: 'karaf4' or 'karaf3'. Use distribution-karaf-version macro to set.
     builders:
-      - shell: !include-raw: include-raw-integration-get-bundle-vars.sh
+      - shell: !include-raw: integration-set-variables.sh
+      - inject:
+          properties-file: set_variables.env
 
-# Macro: integration-distribution-check
-# Operation: this macro deploys the controller with all fetures
-# Used by: {project}-distribution-check-{stream} job template
+- builder:
+    name: integration-detect-variables
+    # Operation: Construct variables including online detection and export using detect_variables.env
+    #   This calls integration-set-variables internally.
+    # Required bash variables:
+    #   KARAF_VERSION: 'karaf4' or 'karaf3'. Use distribution-karaf-version macro to set.
+    builders:
+      - integration-set-variables
+      - shell: !include-raw: integration-detect-variables.sh
+      - inject:
+          properties-file: detect_variables.env
 
 - builder:
     name: integration-distribution-check
+    # Operation: Locally deploy ODL with all fetures, check it is not broken.
+    # Required bash variables:
+    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
+    #     Use distribution-karaf-version macro to customize.
     builders:
-      - shell: !include-raw: include-raw-integration-distribution-check.sh
-
-# Macro: integration-deploy-controller-verify
-# Operation: this macro deploys the controller with all fetures
-# Used by: distribution-deploy-{stream} job template
+      - integration-set-variables
+      - shell: !include-raw: integration-distribution-check.sh
 
 - builder:
-    name: integration-deploy-controller-verify
+    name: distribution-deploy-verify
+    # Operation: Deploy ODL with all fetures and check it is not broken.
+    # Required bash variables:
+    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
+    #     Use distribution-karaf-version macro to customize.
     builders:
-      - shell: !include-raw: include-raw-integration-deploy-controller-verify.sh
-
-# Macro: integration-deploy-controller-offline
-# Operation: this macro deploys the controller with no external repo configuration
-# Used by: integration-distrbution-offline-{stream} job template
+      - integration-detect-variables
+      - shell: !include-raw: distribution-deploy-verify.sh
 
 - builder:
-    name: integration-deploy-controller-offline
+    name: distribution-deploy-offline
+    # Operation: Deploys ODL on the current system, with no external repo configuration, check it works.
+    # Required bash variables:
+    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
+    #     Use distribution-karaf-version macro to customize.
     builders:
-      - shell: !include-raw: include-raw-integration-deploy-controller-offline.sh
+      - integration-detect-variables
+      - shell: !include-raw: distribution-deploy-offline.sh
 
 # Macro: integration-deply-controller-run-test
 # Operation: this macro deploys single contoller and runs test
     builders:
       - shell: !include-raw: include-raw-integration-replace-block-text.sh
 
-# Macro: integration-compare-distributions
-# Operation: will compare an already created distribtion (probably last
-# published to nexus) to the current distribution being created.
-# The comparison is done to find the list of patches that are new to the
-# current distribtion.
-# Used by: builder-merge job template
-#
-# This script requires the bundle vars that are created by the
-# get-bundle-vars macro script
-
 
 - builder:
     name: integration-compare-distributions
+    # Operation: will compare an already created distribtion (probably last
+    # published to nexus) to the current distribution being created.
+    # The comparison is done to find the list of patches that are new to the
+    # current distribution.
+    # Required bash variables:
+    #   KARAF_ARTIFACT: 'karaf' or 'distribution-karaf'. Use integration-set-variables.
     builders:
       - shell: !include-raw: include-raw-integration-compare-distributions.sh
 
+- builder:
+    name: integration-upload-distribution
+    # Upload distribution karaf artifact to Nexus SNAPSHOT repo for testing.
+    # Arguments:
+    #   {dist-pom} path to pom file containing the version
+    # Required bash variables:
+    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
+    #     Use distribution-karaf-version macro to customize.
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: odl-global-settings
+              variable: GLOBAL_SETTINGS_FILE
+            - file-id: integration-settings
+              variable: SETTINGS_FILE
+      - integration-set-variables
+      - inject:
+          properties-content: BUNDLE_POM={dist-pom}
+      - shell: !include-raw-escape: integration-upload-distribution.sh
+      - inject:
+          properties-file: integration-upload-distribution.env
+
 ##############
 # Publishers #
 ##############
diff --git a/jjb/integration/integration-set-variables.sh b/jjb/integration/integration-set-variables.sh
new file mode 100644 (file)
index 0000000..90210eb
--- /dev/null
@@ -0,0 +1,25 @@
+
+if [[ "$KARAF_VERSION" == "karaf3" ]]; then
+    KARAF_ARTIFACT="distribution-karaf"
+else
+    KARAF_ARTIFACT="karaf"
+fi
+
+if [ "$JDKVERSION" == 'openjdk8' ]; then
+    echo "Preparing for JRE Version 8"
+    JAVA_HOME="/usr/lib/jvm/java-1.8.0"
+elif [ "$JDKVERSION" == 'openjdk7' ]; then
+    echo "Preparing for JRE Version 7"
+    JAVA_HOME="/usr/lib/jvm/java-1.7.0"
+fi
+
+echo "Karaf artifact is ${KARAF_ARTIFACT}"
+echo "Java home is ${JAVA_HOME}"
+
+# The following is not a shell file, double quotes would be literal.
+cat > "${WORKSPACE}/set_variables.env" <<EOF
+JAVA_HOME=${JAVA_HOME}
+KARAF_ARTIFACT=${KARAF_ARTIFACT}
+EOF
+
+# vim: ts=4 sw=4 sts=4 et ft=sh :
index bc95b5d6454e733dcd35e10b3563bde621325c33..fb4702a60b164ceef7384c7b84ac2c6f1ef0f7df 100644 (file)
@@ -15,7 +15,7 @@
 # opendaylight-infra-parameters: main project integration/test ($PROJECT)
 # jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
 # integration-distribution-branch: distribution branch ($DISTROBRANCH)
-# integration-controller-bundleurl: distribution URL ($BUNDLEURL)
+# integration-controller-bundle-url: distribution URL ($BUNDLE_URL)
 # integration-controller-scope: only or all features ($CONTROLLERSCOPE)
 # integration-controller-features: features under test ($CONTROLLER FEATURES)
 # integration-test-options: robot options ($TESTOPTIONS)
@@ -48,8 +48,8 @@
           branch: '{verify-branch}'
       - integration-distribution-stream:
           stream: '{verify-stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
@@ -62,6 +62,8 @@
           test-plan: '{project}-{functionality}.txt'
       - integration-jdk-version:
           jdkversion: '{verify-jdkversion}'
+      - distribution-karaf-version:
+          karaf-version: '{verify-karaf-version}'
 
     scm:
       - integration-gerrit-scm:
@@ -95,9 +97,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
           branch: '{verify-branch}'
       - integration-distribution-stream:
           stream: '{verify-stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
           test-plan: '{project}-{functionality}.txt'
       - integration-jdk-version:
           jdkversion: '{verify-jdkversion}'
+      - distribution-karaf-version:
+          karaf-version: '{verify-karaf-version}'
 
     scm:
       - integration-gerrit-scm:
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     scm:
       - integration-gerrit-scm:
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-test-options:
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-test-options:
           branch: 'master'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
           artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
           branch: '{branch}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - string:
           settings-type: cfp
           global-settings: odl-global-settings
           global-settings-type: cfp
-      - distribution-check-deploy-distribution:
+      - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - trigger-builds:
           - project: '{csit-list}'
             block: true
             predefined-parameters:
-              BUNDLEURL=$BUNDLE_URL
+              BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:
index 875872dd487101bab1004df9705809c6905a7aef..12baba1dee06c5d5396fd1fd60db48815f857f39 100644 (file)
@@ -28,6 +28,7 @@
 
       - carbon:
           branch: 'stable/carbon'
+          karaf-version: karaf3
           jdk: 'openjdk8'
           jre: 'openjdk8'
           csit-list: '{csit-list-carbon}'
@@ -39,6 +40,7 @@
 
       - boron:
           branch: 'stable/boron'
+          karaf-version: karaf3
           jdk: 'openjdk8'
           jre: 'openjdk8'
           csit-list: '{csit-list-boron}'
@@ -50,6 +52,7 @@
 
       - beryllium:
           branch: 'stable/beryllium'
+          karaf-version: karaf3
           jdk: 'openjdk7'
           jre: 'openjdk7'
           csit-list: '{csit-list-beryllium}'
           refspec: 'refs/heads/{test-branch}'
           artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
-          branch: '{branch}'
+          branch: '{verify-branch}'
       - integration-distribution-stream:
-          stream: '{dist-stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+          stream: '{verify-stream}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
       - integration-test-options:
           test-options: '-v TIMEOUT_BUG_4220:10s -v USE_NETCONF_CONNECTOR:True'
       - integration-stream-test-plan:
-          stream-test-plan: 'test-libraries-{dist-stream}.txt'
+          stream-test-plan: 'test-libraries-{verify-stream}.txt'
       - integration-test-plan:
           test-plan: 'test-libraries.txt'
       - integration-patch-refspec:
           branch: '$GERRIT_REFSPEC'
       - integration-jdk-version:
           jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{verify-karaf-version}'
 
     scm:
       - integration-gerrit-scm:
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
 
     builders:
       - trigger-builds:
           - project: '{csit-list}'
             block: true
             predefined-parameters:
-              BUNDLEURL=$BUNDLEURL
+              BUNDLE_URL=$BUNDLE_URL
 
     publishers:
       - email-notification:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
 
     builders:
       - trigger-builds:
           - project: '{csit-sanity-list}'
             block: true
             predefined-parameters:
-              BUNDLEURL=$BUNDLEURL
+              BUNDLE_URL=$BUNDLE_URL
 
     publishers:
       - email-notification:
 
     project-type: freestyle
     node: centos7-java-builder-2c-8g
-    jdk: '{jdk}'
 
     properties:
       - opendaylight-infra-properties:
           artifacts: '{archive-artifacts} **/dependency_tree.txt'
       - integration-distribution-branch:
           branch: '{branch}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - maven-exec:
           settings-type: cfp
           global-settings: odl-global-settings
           global-settings-type: cfp
-      - distribution-check-deploy-distribution:
+      - integration-upload-distribution:
           dist-pom: distribution/pom.xml
       - trigger-builds:
           - project: '{csit-list}'
             block: true
             predefined-parameters:
-              BUNDLEURL=$BUNDLE_URL
+              BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - opendaylight-infra-shiplogs:
     # 8. Start the job with your parameters, see https://wiki.opendaylight.org/view/Integration/Test/Running_System_Tests#Running_System_Tests_Using_Custom_Distribution_Built_From_Multiple_Patches
     # 9. The multipatch job waits for the csit job to finish, so abort csit if you see something went wrong.
     # 10. Navigate to Sandbox page of the csit job, click the run triggered from multipatch.
-    # 11. Click Parameters and copy the long value of BUNDLEURL field to clipboard.
-    # 12. Run the same csit job woth different patchset or test options, or other csit jobs, with this BUNDLEURL value
+    # 11. Click Parameters and copy the long value of BUNDLE_URL field to clipboard.
+    # 12. Run the same csit job woth different patchset or test options, or other csit jobs, with this BUNDLE_URL value
     #     so you do not have to wait for multipatch build. Repeat step 12.
     # 13. Currently, the .zip lasts 24 hours (?) so you may need to jump to step 2 (or 0) after some time.
 
           run-test: 'false'
       - integration-distribution-branch:
           branch: '{branch}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: 'integration/distribution'
           settings-type: cfp
           global-settings: odl-global-settings
           global-settings-type: cfp
-      - distribution-check-deploy-distribution:
+      - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml
       - conditional-step:
           condition-kind: boolean-expression
                 - project: '{csit-list}'
                   block: true
                   predefined-parameters:
-                    BUNDLEURL=$BUNDLE_URL
+                    BUNDLE_URL=$BUNDLE_URL
+                    KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - opendaylight-infra-shiplogs:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
 
     triggers:
       - timed: '{schedule-weekly}'
           - project: '{csit-weekly-list}'
             block: true
             predefined-parameters:
-              BUNDLEURL=$BUNDLEURL
+              BUNDLE_URL=$BUNDLE_URL
 
     publishers:
       - email-notification:
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-jdk-version:
           jdkversion: '{jre}'
 
           - project: '{csit-high-frequency-list}'
             block: true
             predefined-parameters:
-              BUNDLEURL=$BUNDLEURL
+              BUNDLE_URL=$BUNDLE_URL
 
     publishers:
       - email-notification:
diff --git a/jjb/integration/integration-upload-distribution.sh b/jjb/integration/integration-upload-distribution.sh
new file mode 100644 (file)
index 0000000..7da49a3
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/bash
+set -xeu -o pipefail
+
+BUNDLE_VERSION=$(xpath "${BUNDLE_POM}" '/project/version/text()' 2> /dev/null)
+BUNDLE="${KARAF_ARTIFACT}-${BUNDLE_VERSION}.zip"
+BUNDLE_FILEPATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}"
+ls -l "${BUNDLE_FILEPATH}"
+LOG_FILE='integration-upload-distribution.log'
+echo "Uploading distribution to Nexus..."
+"$MVN" deploy:deploy-file \
+    --log-file ${LOG_FILE} \
+    --global-settings "$GLOBAL_SETTINGS_FILE" \
+    --settings "$SETTINGS_FILE" \
+    -Dfile="${BUNDLE_FILEPATH}" \
+    -DrepositoryId=opendaylight-snapshot \
+    -Durl="$ODLNEXUSPROXY/content/repositories/opendaylight.snapshot/" \
+    -DgroupId="org.opendaylight.integration.${GERRIT_PROJECT//\//.}" \
+    -DartifactId=${KARAF_ARTIFACT} \
+    -Dversion="${BUNDLE_VERSION}" \
+    -Dpackaging=zip \
+    || true  # Sandbox is not allowed to uplad to Nexus.
+
+cat "${LOG_FILE}"
+
+BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} || true | awk '{print $3}')
+echo "Bundle uploaded to ${BUNDLE_URL}"
+
+# Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus
+env | grep BUNDLE_ | sort | tee integration-upload-distribution.env
index 42cd514714820c48133c9bd58dad7564c69c5159..31c33e71bbea32dc627af5d61b369e03cee79ec4 100644 (file)
@@ -23,6 +23,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     # TODO: Delete the following if suites are compatible with Boron again.
     verify-stream: 'carbon'
index 44231502d65000c23cea55bf6849c0cac5b338c4..63ae08f99415b645c8cd981bf2c3a6410a4897cf 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index ef9192d955f7bf6fb5d148038bd6b13247757eda..169577e4e65638451183a78645830f262adf8520 100644 (file)
@@ -34,6 +34,7 @@
     project-name: 'jsonrpc'
     stream: carbon
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index db65a17e31345b09537f817100f2232224ed0b0f..2d14a29de80b62f6934c26b10c2492d72bb65718 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 76ecbbb717735d3dc18311e86246113381c335fa..bb1fe3955f915de72cbd0639e141013c373fc2ad 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index be2d089e924293a40bcee158ea49a1ad9a83772d..e899f68b8d9e03998df71c8d743e1e9e5d2870fe 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 24dfe9c7a2337b82af77beaf1fe3994e74c04420..5bd174ee1f640d35ee14f1d7cd13436a82e74dcf 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jdk: 'openjdk7'
+          karaf-version: karaf3
 
     feature:
       - all:
index 4b75a36655dcf5320e38ccc313e80a3e48ff00a4..a63e1e46c38571ce71944c9a99ed6dcd72479a4d 100644 (file)
@@ -36,6 +36,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -45,6 +46,7 @@
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -77,6 +79,7 @@
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 5d184f2028000a2f75abcf0422dac60cf02c3615..db0539a769ab98ed046ea6239253b198d167faed 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index a9acc22d327a7eefe9042ad33e28ab77a168bcc9..dfdeebce7c3b6618b46ff89618e5344b6d6d2985 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 45e6dd36e3886faa7de4d1fb68d0fa72115bcda8..018ea27a32c53633d8002293436ae1958a39a259 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index aab9b0f666651068aeb3f2bcbefd39668a9c00d7..3d1f1ae4b6eb44cef4793cdc916b23ff0dea06d7 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index dd9b65b93ebbc2f26ed3f97064d3134bd07c1cad..02269be4ef1de684997fd1c1a4a53cd7fa66eabe 100644 (file)
@@ -32,6 +32,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -41,6 +42,7 @@
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -69,6 +71,7 @@
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index c91af50441823c56b5b86c4adf53f1052377fd5d..f2987c5f8ba24a0adee2905dd42cd13ad6d2efe4 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
           robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
-
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           robot-options: '-v JAVA_7_OPTIONS:-Xmx6144m@-XX:MaxPermSize=512m --escape space:@'
 
     install:
index 088b60cc88e89060376062f105d75129a23feaa2..5ac926ed61c83433a0273b5370a3d8f052966b5c 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index f40f634b3a89b46178c9a3172096c5ff1ed3fdc1..a2b2009b309ae71bd51c5b28f34ebe35f47937ee 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 1aacfab228f072ef9e5ac6a07e9a3f268cccd40f..d4db1a5b29cc87330a6a6a1e15baf77719eb69b2 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index e1e7b27e46453036cca7bb185b50c13b63cfefc7..cba91f67fa734c11b09a4eb5cf720f8d07bb7613 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index d8c10e852609fe6c0c6c94549fc77abc5e770ca5..e5c7bb2d75d65506d960bc0aa290b105ad496c9b 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'natapp'
     project-name: 'natapp'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'natapp'
     project-name: 'natapp'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index f83ef439eb7f09e2318340740167a69908ab2431..d48097dfd9344934c989136b027f2f013a195cfb 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index d106107a3148f22bb68d07feee2e6335e0435275..5c28e9ae9989e014c4009c697efa483dda66ebc2 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index b7abddaa92649cfcde8a34b103b497ff342309de..07bf090903b0cee97d54d857c1591161aadd9973 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 4150339bb4f35633e5016441233a552e8ad115dc..1347af9cefd56ac75c04d252ad97a9ccc0bb8538 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 6db95f8bdf99b7f07029237479f1f713c5a60c21..429f207e5c0bf742404901b0bbb74c2940ea571a 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index e421e0b39f9a140c0e388e12d80d36bec493e8be..eb2ada4993d1506a8e3e309fbda70664f2519d7b 100644 (file)
@@ -18,6 +18,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index c05e673179b59bf6d005d2e5640f50fc6af7028a..4c7763258d7f8c8953449bc9b377f6d3902b6975 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-clustering-test-app,
@@ -31,6 +33,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-clustering-test-app,
index 54a9ec27ac6ca03dcde75409089793517b8d76c5..fdf269f6875d1ffbefeca5d4c5b34be86255eeec 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-netconf-mdsal,
@@ -32,6 +34,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-netconf-mdsal,
index 4e0115749366c777febaa9983b4cfb4b3a262da8..5dec7553cff2478f7061b4cabb7512eeaa26e80f 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 0fcf193d7092eaf4d2af1c25dafd8792f4e456dd..26f190b87781545f04c8cfb14c2e44e33eea4e3a 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 4ad1774269e093e0f762880951c940f86122a714..8a29a5066a0312013dcecd3659b0fc0ba0cfeb30 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'netide'
     project-name: 'netide'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'netide'
     project-name: 'netide'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'netide'
     project-name: 'netide'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 6d6b9987c93cd5eaa6b7cdb86c97b6345920d559..d439307110b2234283798748a42fcd1d5ca6ce49 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     openstack:
       - mitaka:
index 49832191160766f08adff1a1dae4bab144009074..31b405f46b7aaeee808bf727826aae7cfd37ece2 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     openstack:
       - mitaka:
index b8e0f72b1967db596b0e312a0549d7b652da8cb5..c2665f0dcee1e138fab8b09d66889308b81cc750 100644 (file)
           jdk: openjdk8
           jdks:
             - openjdk8
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jdk: openjdk8
           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'
index 89acb6be8dc09012155b7b26482ae765603de860..7390064d9db0fdb9d91a3b0101004a4a71e4b1c7 100644 (file)
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 55fa716e8c38d1cb12528410934f5597fb925f48..0afc21c2d0368807e2d529d81c284edbf93dee91 100644 (file)
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     openstack:
       - mitaka:
index 3d36c38ef43f301af39b2b5f7680d6e08879ba7e..c1edd3842de9929cf28f35c138c5203d87e274b0 100644 (file)
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index d726c0fbaac5d334395973a7f233ed46b14815f4..77d02232fd6a2861d9430159093d91ceaaace64c 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
-
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'
+          karaf-version: karaf3
 
     feature:
       - legacy:
index dae6114bfe0f2aa57965e3d38290107ec881fb3c..e9941c209bdf754111131a5722550d368a4da4e0 100644 (file)
@@ -37,6 +37,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -46,6 +47,7 @@
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -79,6 +81,7 @@
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'topic/vpp'
+    karaf-version: karaf3
     distribution_branch: 'master'
     jdk: openjdk8
     jdks:
index 4eb63b6125a8924dbf97ac5590be8eab891a3cf0..94e6cab88856aa246e8e9218948fd97cb650d937 100644 (file)
@@ -32,6 +32,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -42,6 +43,7 @@
     project-name: 'neutron'
     build-timeout: 60
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -69,6 +71,7 @@
     project: 'neutron'
     project-name: 'neutron'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -96,6 +99,7 @@
     project: 'neutron'
     project-name: 'neutron'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index 7ab0b5a1961566bd9631c8069758999cea34b019..22b31f3ace8343b8df7cb1ea9be692a9064d0453 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'next'
     project-name: 'next'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'next'
     project-name: 'next'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'next'
     project-name: 'next'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index ed3e98215bea680fb9f747fb635e5b32ab2726f1..3f92dc6c45305260c84a91ef9a2d9939e36341fe 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index c6db4387bc1dda231fb787e77b27881a48a070d3..61ef22ebf0c857b31131abf2891e72c031697b65 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 51f8a18f033a0ca28ba58769af12ca1d833760dd..d01ee081daa7e347628d22e8d420f9c5a0cda3dd 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 6b6cc324d176ca6daf0ca8f9b5a6a23766b10f08..c9a7d8fe783fc53f21ed18c53fa7790fe42129f3 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index bb5809fb003d17011093671894d630cc5dab086d..ea00461e84903d2ff92f1b7a9c79499071be3acc 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 728f00bd119f6a14a893fc27d3175ba8ff32a07a..65e1bada21efe37bf9e8eb192f21e988548a6115 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index 35adcbff6d54d90996632ff12d74db82eb0b6e12..55704240683c8351dc77dea6be2fbcb186467b45 100644 (file)
@@ -32,6 +32,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -42,6 +43,7 @@
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -69,6 +71,7 @@
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -96,6 +99,7 @@
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 56458ff4a4c5b1a869462164654e9f1c2fe5ab49..b8222a6a0c60f6c83c53d53d27276324c0562920 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index c02f9eb5f04effa224326e80847a1dca86ec1e67..5aa4e5c0613e701bb09f39080974cdaf3f432893 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index d5242d379099ac17c204a554d838261dc4719e4a..5671a7231e9b0649cacbbbd61b68f4ec3c776cd6 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 20b399517a59f59befc85fea4bbc464d1fa8cd48..f4278fb72e61783d7353b0e72f62eb8d8c97d01e 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index b2d6ee43e8a7310700908fdfee1aef6b4246cf76..747beac833f031464ab4ab0cfddf8f1a4ee092d4 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index b3f5f21202c56d01da705b4e6afcbd7b395438ed..95e6917af6c8e2761fc0cbccad661806c6ac73a3 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index bca0ee34528001a5494a583d0c3be23a10e0f967..3d751e6ec69c4ec9c858d6aa07ce73a5bf3c2ac9 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 857cc22a84c42b60a4f20e4107cfc759dafee21d..baf8cf05ae446aa76d6fe9b285fe6baa0aca7d11 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index b337e58a456e982b3b4b97091a5a8620b55538d9..8400e9bd909683641414659c2469fc029acbd0a3 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index e5d7ea1dd887766fe96ffb82ae2d953c971636ce..9c01b85e797af0973023d5fada57086933736f91 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 7f249ab4f195a92030fdd388c2fc934b8e959fd8..bf5df91ad5ec880b31614d8c99b9b23f95003855 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index c6a78b1e8b11a9d55cd99a7b5d8bee28fddf0c02..d2aca6b9770b6bb55b310d4b53be9cd48431613a 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index afb19c9220651e79b63eb9da1d1b0da609a6250d..b308f19335230cd314215a9bed043580170324de 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 73641de366e741a9ca62eef9475251baa68eae10..29d2077453b17b9f82ebe5964858d5ec842d4748 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index dfd7c749f1828c3acdd6ea3cdfeb274ba25ee65e..1b29b0b1e377db1cac47b873e148b04ed26143e0 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index e141f08a8246b8c2441feb013647f10904fab29f..deba1fa0636ac502d4df5dd82920b9c21cf0c2a4 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 92e477044fc9929c9439edd57a7e0dccdb3555ec..ac1a48a78c2b1743e13ace25b0b5b9c7320290e8 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 991b352ef6d8713fb57dc96f415cee523c2cab6c..f5a2f9c0525031b2d1e8ad3567532b814e906628 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 790b7153ee8b2eb28e37c575caea2c3eaa1fd4e6..70049cd05556c45b44cc90b00df9d34f7e659d92 100644 (file)
@@ -16,6 +16,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 41c069444fa09b57a88c8d77aff194dcafbe57d5..2305d82752e5285d31953f51e419cab25a55a5da 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 9d2d02a4ba173c2a6db3723b163f268533302971..4345cf522214cb1d960fc75384c4abeaa7a33881 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 3754da4ae262b7a536a8a0c190b7551dcbbec91a..5a93945e0251dc71f5d1ac58664b2e45d68284cc 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 6d8c5988427d1b8b6d4dccbd9d4db251c2cb9e18..2a5daf2cbb141657bbdc8892c111dda3b7734ac9 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index e7b516437bd15a45301fea6ac1f0b41f573c9c2f..b7381d7820085e2a3362fff6b257b21cc08bd5cc 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 9e5462c2a18f40551e4e4e471ef696d017102eea..bcc131407f5b14120cf34db93a96fbe89936993c 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 90c9585cfaeae0b8088f8a3915bb3cd65a6f4aae..8d77c05e74334c24f113163f0ebb948faa80dcc7 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 1d659a4c1fbdeac50f1563ffbcbeeb62fa844d4a..ac59b4f0979404b1ea46ed440b6f1f15241318db 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 732b09cb14f69ea6b79c9dd903cb394d56382166..9bd657d8c7354bb141b309af53694cfe1f57a991 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 74b50e5d69f54acb3e82dc11d41e54410997b55e..ffc19f45f2ccf3adc27d5f844639e9dafab323e0 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 1fe32c1ddbe9eafaa148f61652df73f6974dafed..f35f5af711f64f81aa0174ad0a417b1de7d0a169 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index f71e99fd893887f9f8b56bb395a08a37d803bc70..72e28894d68c635a58447350d734d7c6c0d85cf3 100644 (file)
@@ -15,6 +15,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index a2abd6f3d7c4da962a3967e7e1ed511e2af43534..7e936dd370d7899d499f7dd7d9d67d572ec2612b 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 2b5b564020e285c10457e9cc43202b62b57826d1..3dcfffb4059e962697b56dcc426334bb4a375104 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'
+          karaf-version: karaf3
 
     feature:
       - core:
index 8c6c18025594bbe7746d32685ce15966a6bcbcc3..59be99d40d60f5bf62edbcc1f1b7b25c3e7365da 100644 (file)
@@ -35,6 +35,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -44,6 +45,7 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -75,6 +77,7 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 2514943aa83e1c23aff2f188d40127029b9540b6..974c83fd05e776f753e5a22d1b9537264bccb45e 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 16e13831a5f8ab43457359f5184d4e58dd74976b..a55e9f8d067e53d912ce545ae3747eeccf8d7697 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index bc0c2c723a9a65b3bc121d3465d62418493eea24..87fee427ed361f89e18d70e13a404d6937df21f1 100644 (file)
           jdk: openjdk8
           jdks:
             - openjdk8
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jdk: openjdk8
           jdks:
             - openjdk8
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jdk: openjdk8
           jdks:
             - openjdk8
+          karaf-version: karaf3
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
index 427bdcb46f87171bac9fd3c618d3e5e697966610..b5b92f83fdc02ec0b0a2012d5e3578af671c76ee 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'
+          karaf-version: karaf3
 
     feature:
       - genius:
index f16d1652ca9c8e7a075c76db4c2f9798d34a327a..52247b8ce29e84527c234ac7ef0ee717e8c82543 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index aa6304a8274d487db4a0b81586e85998495cdb7e..e6941bf99e022a22585c6fd0210cd439fe4b2360 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 7a78a5559e008f222c829d1ded05f53264bc3006..77c9b5bd38284078741e17c3aac852e9efb2a7fe 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 950a74becf7ac64cab486754d5ae2665762b2f2e..c84352ed9ec79406870c48a7727e68187f845d07 100644 (file)
@@ -37,6 +37,7 @@
     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
@@ -63,6 +64,7 @@
     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
@@ -89,6 +91,7 @@
     project: 'persistence'
     project-name: 'persistence'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index ec0423d5a59e6402db061b0fc8bde4bcd4fbbe7a..0369cf435d89cf5ce24f2a53b7924e683a8b890e 100644 (file)
@@ -4,6 +4,7 @@
 - defaults:
     name: global
 
+    karaf-version: karaf4
     build-days-to-keep: 30
 
     # Timeout in minutes
@@ -46,7 +47,7 @@
     os-cloud: rackspace
 
     # Distribution bundle URL
-    bundleurl: 'last'
+    bundle-url: 'last'
 
     # CSIT images configuration
     stack-template: csit-2-instance-type.yaml
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: 'stable/boron'
+    verify-branch: stable/boron
     # Value for ODL_STREAM
-    verify-stream: 'boron'
-    verify-jdkversion: 'openjdk8'
+    verify-stream: boron
+    verify-karaf-version: karaf3
+    verify-jdkversion: openjdk8
 
     # Maven / Java
     jdk: 'openjdk8'
         controller-csit-1node-notifications-longevity-only-nitrogen,
         controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
         controller-csit-3node-drb-precedence-longevity-only-nitrogen,
+        distribution-deploy-nitrogen,
+        distribution-offline-nitrogen,
         openflowplugin-csit-1node-periodic-longevity-only-nitrogen
     csit-weekly-list-carbon: >
         controller-csit-1node-notifications-longevity-only-carbon,
         controller-csit-3node-drb-partnheal-longevity-only-carbon,
         controller-csit-3node-drb-precedence-longevity-only-carbon,
+        distribution-deploy-carbon,
+        distribution-offline-carbon,
+        distribution4-deploy-carbon,
+        distribution4-offline-carbon,
         openflowplugin-csit-1node-periodic-longevity-only-carbon
     csit-weekly-list-boron: >
+        distribution-deploy-boron,
+        distribution-offline-boron,
         openflowplugin-csit-1node-periodic-longevity-only-boron
 
     # CSIT Test List Variables
index cf1f3a51375499c0005f7dd0e93b91a3a16b2c47..b1b8823f8d1e7c12a98eaf5458e8bf7d4792e966 100644 (file)
               {mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-
-- builder:
-    name: distribution-check-deploy-distribution
-    # Deploy distribution-karaf zip to Nexus SNAPSHOT repo for testing.
-    # Arguments:
-    #   {settings-file} to use for opendaylight-snapshot credentials
-    builders:
-      - inject:
-          properties-content: BUNDLE_POM={dist-pom}
-      - shell: !include-raw-escape: deploy-distribution-get-vars.sh
-      - inject:
-          properties-file: deploy-distribution.env
-      - config-file-provider:
-          files:
-            - file-id: odl-global-settings
-              variable: GLOBAL_SETTINGS_FILE
-            - file-id: integration-settings
-              variable: SETTINGS_FILE
-      - shell: !include-raw-escape: deploy-distribution.sh
-      # Re-inject BUNDLE_URL so that downstream projects can use it.
-      - inject:
-          properties-file: deploy-distribution.env
index 2db2ec9ae143192a4ee88544bed616fb76daa628..59a729eab8f3ea0d0b27184c4191237952f5f108 100644 (file)
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
 
-- job-template:
-    # Template: {project-name}-distribution-check-{stream}
-    # Goal: Build a patch and make sure the distribution can deploy with this change.
-    # Operation: This job template builds a patch, creates a distribution containing
-    #            the patch (making sure dependencies are specified),
-    #            and performs the distribution deploy test.
-
-    name: '{project-name}-distribution-check-{stream}'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-      - integration-distribution-git-url:
-          git-url: '{git-url}'
-      - maven-exec:
-          maven-version: mvn33
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: '$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
-      - integration-distribution-scm:
-          branch: '{distribution_branch}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          # Distro-check jobs typically run within 10 - 30 minutes
-          # with 45 minutes being the occassional edge case.
-          # enforce a 60 minute limit to ensure stuck jobs get
-          # cleared up sooner.
-          build-timeout: '60'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - distribution-check-wipe
-      - distribution-check-build-project:
-          pom: '$GERRIT_PROJECT/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-verify-groupid:
-          gerrit-project: '$GERRIT_PROJECT'
-      - distribution-check-download-deps:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-delete-snapshots
-      - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-deploy-distribution:
-          dist-pom: distribution/pom.xml
-      - integration-distribution-check
-
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - postbuildscript:
-          builders:
-            - shell: |
-                #!/bin/bash
-                mkdir -p $WORKSPACE/archives
-                cp karaf*.log $WORKSPACE/archives
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
 - job-template:
     name: '{project-name}-integration-{stream}'
 
index 48ded16a6a9fbc9c81a12ea7942f79664194ea63..37e2e66a0b7a9abd9faa9acf180c6e53c5f0efed 100644 (file)
@@ -36,6 +36,7 @@
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -61,6 +62,7 @@
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -86,6 +88,7 @@
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index b656769b2dc0ecaede92cfde6694928b6c8a4c14..8b31738bfa50ae14eace5fb8a55895d7249b384c 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 31a7d7084c347cee9ca95f5027edd536c70e92c9..054c973879befa1afa754ca1a664655124dd8715 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 79746bf45e013b7161a3f22fbb0f71f722617d39..ba3ee12c03df8883ff440f28628edb67b67b1df2 100644 (file)
@@ -18,6 +18,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index b574a85ba8189fe131fc9a731e27d589004eda7e..f6c8678c39ceadbea75bdd6bdcc299d2f8c9bb41 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 0b14612fda5db85f989b56bd8e243744019a7900..d52ce1081b89ee920652e6802c76a533368995ac 100644 (file)
@@ -15,6 +15,7 @@
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
+          karaf-version: karaf3
 
     feature:
       - basic:
index dbac35d27219884f88630dbe2af5c62e429ff67c..b82ec9851d534545b8083363a62964e7ceb4aa73 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 0834978a83c8de5900f15518efcff3efe51e2de0..2601fee5ed1c6874a694d267de1837fff5bb9380 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -95,6 +98,7 @@
     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index feaadb60c10ccf4f9772f8fb528537e33f95d181..720213d7ba6d707b6450ba061a0499508c311168 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 7db03f57351e9c01f2e69d453f7221e2f115b73c..47021f45b2e27553fee4fca8f6bd211cb8863321 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index c70c3a90ff29bdd8293ff3d27a3f34d66cf39b88..47747815ee5f2efbedbbbb37ac67de71090f1b1b 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 4fc6b2208c2cff3398ca0c431d67cd5df5d9760c..8429fcdffe91a2309e9c49010d8dd7c1f039b9b9 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index eba3bd59689aed3cc7284a215250e8131a89c10d..afd64a358f57fda459547ee870cd41d8a60c09e4 100644 (file)
@@ -18,6 +18,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 4492e7ecb000a402788cfd074b1af79cde105434..b651009edc36bc5e68be8ec9a8b59590b27cb780 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index b2ab9b500c4cc2319046e6e2f94ce25333892a0c..4d58157cf5033378dfcc2fb35c89061491707522 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 39859880b6a6590d81fc202a284e2935e791f1d4..5b1b39e2b17eba78e316f9510e9d5d92ee4945be 100644 (file)
@@ -18,6 +18,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index b1a86a7741e114265e67d1b4a047b1bf1af5c4e1..25edbef3abdb8c3182126de46c2a364ce3985d54 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index f233596d6f9b58a841b5c7f2ce58f1f2020f69f0..86b12f343e7ab4812ffc67e6313fc76b60b03cb4 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index a97bf69bdf7075130213d9f39b2b0deb6098707c..db349c98c3a3747b62e55ac07c3f15c66dc77325 100644 (file)
@@ -36,6 +36,7 @@
     project-name: 'systemmetrics'
     stream: carbon
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index d38d6f47dc50dcaef226b948128bfa852031f67b..cd2bb78d2874ff5a9da3d2e3d1a17d1fd250d5c3 100644 (file)
@@ -37,6 +37,7 @@
     project: 'tcpmd5'
     project-name: 'tcpmd5'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -63,6 +64,7 @@
     project: 'tcpmd5'
     project-name: 'tcpmd5'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -91,6 +93,7 @@
     project: 'tcpmd5'
     project-name: 'tcpmd5'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index ebb8a8f48ef1b1a0bb1caa697ffd881f71d670fb..d8a8881f225a32a6f7f7e832dafe8ee890de9ce2 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index fcc51b7af3e6e46522b631163ebc405bc39e8a18..fa72c749e678c0f4db0bc15f450c6d8309c390f3 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -95,6 +98,7 @@
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 37726167c2d33da7b3879a96773f808f39f5e3d4..b8fff6e13c4eb531db64ecc640821ba1cea05cbf 100644 (file)
@@ -36,6 +36,7 @@
     project-name: 'transportpce'
     stream: carbon
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index fbd793f4724d0b0451f8b3a3dc559df3dcbe528b..99c9dc322bd215b5fa373757e9b549709947cafa 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index b4dcbf2416f84d8d6b54682ca9cd1f37d815b798..674b57b3f7cc65fbfd1070ddc1d9e743d6c1ece8 100644 (file)
@@ -19,6 +19,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 54c2ccb7ca478fc685dfc9973a5c5b28a57f1f97..bb99a172a347b3b899464a847a8c432511edfa24 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 4de2fe4dcc1d67822782686585100ec5e521ba66..401c1e09f9758738bd272c4c3af12a8d6eac956e 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 127d46273d6e9e670009208ae2c5bdea915ba1cd..1b357c77fa326a404c29c7a6e7ee363a347796c9 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 86cfe80ceb984869b82557dee019b9b915271ad4..e2a549fe1336ab5fa045d535cb74244457ae2fb6 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index f537bcf22e3e6d1db1a6ba2b6d0c1e4b56052256..8a5067f273b16018e28fc87746a90a097289ff48 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 973a1a9fc563a6fb08094b1ec0e7ffb0a18c6df1..214c62042cb99cef545e50f4c5e49c1524ad45e4 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index 983333125de153af2a9c29f533aaa457b80dfa75..12b55668c1eda981e936ee1c2e3ba6e941fa6988 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -95,6 +98,7 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 030b5258649a2577c1ef073b3f4c1b8cbe26f20a..402b071b47bfe7f2bd8f943fdf866c763121b506 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index cd87d475481534e592ec7bda6586d4671eace644..675c3b6d051cf8af01f29fbd2f414e6b593ae328 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index a503acef2cb02f945cc45b609b0a59c20e09dd68..b827b37005ee47937d216a5fdb88d740973351ac 100644 (file)
       - boron:
           branch: 'master'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 1b9edf438d0ed51e27698d31a6fea56c5d34d0ba..9e965381da82f1616d34dccf48cc988d3bcf286a 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index dae05f0719e8d3c2f23e01c073907e5342c06217..c13bbf62c330c9fd3d0fe2b71adf77c16104f790 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index af91d9dbec90b3461c4fd486d082bdb6050a2a2b..8be32ffae8d9fe1c586ac847e5341f1ae1ac3a39 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 29985c070abfd12e0af5de0467982a0c4fc41691..debef1f1f7e4afe72b09446c16596b8aab93ba15 100644 (file)
@@ -13,6 +13,7 @@
     project: 'vpnservice'
     project-name: 'vpnservice'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 70fac7b56f4dfb097d1a26424b189ba041a9c11b..1e7185d5e06260b5bbf8bea8376af447f3abfcb9 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index d1df4c7311c694ea82d261ff20f66f0e5d7b1101..f1ba019d082c87bf2ccf8caa09a8e491ccfaf015 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
           tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
       - only:
index 96d10bcfcab2518ace506ac88d70923dfbc43e0b..b2b0482889cfe11d4edd90febe26d630b175170d 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439
 
     install:
index 6b56eaba86ddb8f1511f674f31f5753073cf9443..b9917554af48ece233ddba41adc05b55d58b4352 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
 
     openstack:
       - mitaka:
index 6ce6addca3b3961bf1a66a9b91d2524c1b215fc5..347fe2deb06bb834901b7d3edc85d5e3fe798bde 100644 (file)
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
+          karaf-version: karaf3
           csit-list: >
              vtn-csit-1node-manager-only-{stream},
              vtn-csit-3node-manager-only-{stream}
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'
+          karaf-version: karaf3
           csit-list: >
              vtn-csit-1node-manager-only-{stream},
              vtn-csit-3node-manager-only-{stream}
index 3772421016812ec274ff1b4f578732b51dfb2e01..a564d0457ca69050ce2d5645827479ed7a12896a 100644 (file)
@@ -35,6 +35,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -44,6 +45,7 @@
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -75,6 +77,7 @@
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index 610165962ff572f5881259802f4c52b627c434d6..ee4b308e7e9e0795c3a521d5df20b715c708a870 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -94,6 +97,7 @@
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7
index f6aa2617fd5545496ee5c42a9db0cabbf8240c14..b09ac1a5ab170c2d5f210af557df60ae4d6a011c 100644 (file)
@@ -36,6 +36,7 @@
     project: 'yangide'
     project-name: 'yangide'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -61,6 +62,7 @@
     project: 'yangide'
     project-name: 'yangide'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
index fbbccaca456cc1fd22cab57ce8b8df6b01e20b24..bf59fe140b5ae9464297a5d07f219ed90cdb45bb 100644 (file)
@@ -19,6 +19,7 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
index fc0f7458454e7d139aed746418c3934de1063011..7e652a52069b17f591ee948446459f447286f0d4 100644 (file)
@@ -31,6 +31,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -40,6 +41,7 @@
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +69,7 @@
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -96,6 +99,7 @@
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7