From 190f9a3e4e36bfbb01d02e640f8cb6dc05202382 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 20 Apr 2017 10:07:53 +0200 Subject: [PATCH] Make jobs karaf-version specific, some duplicities + 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 --- jjb/aaa/aaa-csit-authn.yaml | 3 + jjb/aaa/aaa-csit-idmlite.yaml | 3 + jjb/aaa/aaa-csit-keystone.yaml | 1 + jjb/aaa/aaa-csit-tls.yaml | 1 + jjb/aaa/aaa-patch-test.yaml | 1 + jjb/aaa/aaa.yaml | 4 + jjb/alto/alto-csit-setup.yaml | 3 + jjb/alto/alto.yaml | 4 + jjb/armoury/armoury-csit-basic.yaml | 3 + jjb/armoury/armoury.yaml | 3 + jjb/atrium/atrium.yaml | 3 + jjb/autorelease/autorelease-macros.yaml | 4 +- jjb/autorelease/autorelease-projects.yaml | 5 + jjb/autorelease/autorelease-templates.yaml | 6 +- ...orelease-get-integration-test-variables.sh | 8 +- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 8 +- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 2 + jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 3 + jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 3 + jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 3 + jjb/bgpcep/bgpcep.yaml | 4 + jjb/bier/bier-csit-basic.yaml | 1 + jjb/bier/bier.yaml | 4 +- jjb/capwap/capwap-csit-ac.yaml | 3 + jjb/capwap/capwap.yaml | 4 + jjb/cardinal/cardinal.yaml | 3 + jjb/centinel/centinel-csit-basic.yaml | 3 + jjb/centinel/centinel.yaml | 4 + jjb/coe/coe.yaml | 1 + jjb/controller/controller-csit-akka1.yaml | 3 + .../controller-csit-clustering.yaml | 3 + .../controller-csit-dnb-noloss.yaml | 1 + .../controller-csit-drb-partnheal.yaml | 1 + .../controller-csit-drb-precedence.yaml | 1 + ...ler-csit-periodic-dsbenchmark-cluster.yaml | 3 + .../controller-csit-periodic-dsbenchmark.yaml | 3 + .../controller-csit-rest-cars-perf.yaml | 3 + .../controller-csit-rest-clust-cars-perf.yaml | 3 + jjb/controller/controller.yaml | 4 + jjb/coretutorials/coretutorials.yaml | 3 + jjb/daexim/daexim-csit-basic.yaml | 3 +- jjb/daexim/daexim.yaml | 1 + jjb/deploy-distribution-get-vars.sh | 13 - jjb/deploy-distribution.sh | 21 - jjb/didm/didm-csit-discovery.yaml | 3 + jjb/didm/didm.yaml | 4 + jjb/discovery/discovery.yaml | 3 + jjb/dlux/dlux.yaml | 4 + jjb/dluxapps/dluxapps-csit-yangman.yaml | 1 + jjb/dluxapps/dluxapps.yaml | 1 + jjb/eman/eman-csit-model.yaml | 2 + jjb/eman/eman.yaml | 3 + jjb/faas/faas.yaml | 4 + jjb/federation/federation.yaml | 2 + jjb/genius/genius-csit-genius.yaml | 2 + jjb/genius/genius-patch-test.yaml | 2 + jjb/genius/genius.yaml | 3 + ...groupbasedpolicy-csit-1node-openstack.yaml | 3 + .../groupbasedpolicy-csit-3node.yaml | 3 + .../groupbasedpolicy-csit-6node.yaml | 3 + .../groupbasedpolicy-csit-clustering.yaml | 3 + .../groupbasedpolicy-csit-sxp.yaml | 1 + jjb/groupbasedpolicy/groupbasedpolicy.yaml | 4 + jjb/honeycomb/vbd/vbd.yaml | 3 + jjb/include-raw-deploy-archives.sh | 2 +- jjb/infrautils/infrautils.yaml | 3 + ...line.sh => distribution-deploy-offline.sh} | 52 +- ...erify.sh => distribution-deploy-verify.sh} | 74 +-- jjb/integration/distribution-jobs.yaml | 315 ---------- .../distribution/distribution-check.yaml | 83 --- .../distribution-csit-userfeatures.yaml | 3 + .../distribution/distribution-jobs.yaml | 537 ++++++++++++++++++ .../distribution/distribution-templates.yaml | 182 ++++++ .../distribution/distribution.yaml | 52 +- ...e-raw-integration-compare-distributions.sh | 18 +- ...de-raw-integration-configure-clustering.sh | 4 +- ...-integration-deploy-controller-run-test.sh | 8 +- ...w-integration-deploy-openstack-run-test.sh | 4 +- ...include-raw-integration-get-bundle-vars.sh | 56 -- ...-raw-integration-start-cluster-run-test.sh | 6 +- .../integration-detect-variables.sh | 50 ++ ...k.sh => integration-distribution-check.sh} | 89 +-- jjb/integration/integration-macros.yaml | 114 ++-- jjb/integration/integration-set-variables.sh | 25 + jjb/integration/integration-templates.yaml | 99 ++-- jjb/integration/integration-test-jobs.yaml | 68 +-- .../integration-upload-distribution.sh | 29 + jjb/iotdm/iotdm-csit-basic.yaml | 1 + jjb/iotdm/iotdm.yaml | 4 + jjb/jsonrpc/jsonrpc.yaml | 1 + .../l2switch-csit-host-scalability-daily.yaml | 3 + jjb/l2switch/l2switch-csit-scalability.yaml | 3 + jjb/l2switch/l2switch-csit-switch.yaml | 3 + jjb/l2switch/l2switch-patch-test.yaml | 3 + jjb/l2switch/l2switch.yaml | 4 + jjb/lacp/lacp-csit-lacp.yaml | 3 + jjb/lacp/lacp.yaml | 4 + .../lispflowmapping-csit-msmr.yaml | 3 + .../lispflowmapping-csit-performance.yaml | 3 + jjb/lispflowmapping/lispflowmapping.yaml | 4 + jjb/mdsal/mdsal-csit-bindingv1.yaml | 4 +- jjb/mdsal/mdsal.yaml | 4 + .../messaging4transport-csit-basic.yaml | 3 + .../messaging4transport.yaml | 4 + jjb/natapp/natapp-csit-basic.yaml | 2 + jjb/natapp/natapp.yaml | 3 + jjb/nemo/nemo-csit-engine.yaml | 3 + jjb/nemo/nemo.yaml | 4 + jjb/netconf/netconf-cluster-stress.yaml | 3 + jjb/netconf/netconf-clustering-scale.yaml | 3 + jjb/netconf/netconf-clustering.yaml | 3 + jjb/netconf/netconf-csit-callhome.yaml | 1 + jjb/netconf/netconf-scale.yaml | 3 + jjb/netconf/netconf-userfeatures.yaml | 3 + jjb/netconf/netconf.yaml | 4 + jjb/netide/netide-csit-basic.yaml | 3 + jjb/netide/netide.yaml | 4 + .../netvirt-csit-hwvtep-openstack.yaml | 2 + jjb/netvirt/netvirt-csit-multi-openstack.yaml | 2 + jjb/netvirt/netvirt-full-integration.yaml | 3 + .../netvirt-legacy-csit-clustering.yaml | 2 + .../netvirt-legacy-csit-multi-openstack.yaml | 2 + jjb/netvirt/netvirt-legacy-csit.yaml | 2 + jjb/netvirt/netvirt-patch-test.yaml | 3 +- jjb/netvirt/netvirt.yaml | 5 + jjb/neutron/neutron.yaml | 4 + jjb/next/next.yaml | 4 + jjb/nic/nic-csit-basic.yaml | 3 + jjb/nic/nic-csit-vtnrenderer.yaml | 3 + jjb/nic/nic.yaml | 4 + jjb/ocpplugin/ocpplugin-csit-basic.yaml | 2 + jjb/ocpplugin/ocpplugin-csit-scalability.yaml | 2 + jjb/ocpplugin/ocpplugin.yaml | 3 + jjb/odlparent/odlparent.yaml | 4 + jjb/of-config/of-config-csit-basic.yaml | 3 + jjb/of-config/of-config.yaml | 4 + jjb/openflowjava/openflowjava.yaml | 4 + ...-csit-bulkomatic-clustering-daily-old.yaml | 1 + ...ugin-csit-bulkomatic-clustering-daily.yaml | 2 + ...-bulkomatic-clustering-perf-daily-old.yaml | 1 + ...csit-bulkomatic-clustering-perf-daily.yaml | 2 + ...plugin-csit-bulkomatic-perf-daily-old.yaml | 1 + ...flowplugin-csit-bulkomatic-perf-daily.yaml | 2 + .../openflowplugin-csit-cbench-daily-old.yaml | 1 + .../openflowplugin-csit-cbench-daily.yaml | 2 + .../openflowplugin-csit-clustering-old.yaml | 1 + .../openflowplugin-csit-clustering.yaml | 2 + ...openflowplugin-csit-flow-services-frs.yaml | 2 + ...openflowplugin-csit-flow-services-old.yaml | 1 + .../openflowplugin-csit-flow-services.yaml | 2 + ...lugin-csit-link-scalability-daily-old.yaml | 1 + ...lowplugin-csit-link-scalability-daily.yaml | 2 + .../openflowplugin-csit-longevity-old.yaml | 1 + .../openflowplugin-csit-longevity.yaml | 2 + ...it-restconf-clustering-perf-daily-old.yaml | 1 + ...n-csit-restconf-clustering-perf-daily.yaml | 2 + ...owplugin-csit-restconf-perf-daily-old.yaml | 1 + ...enflowplugin-csit-restconf-perf-daily.yaml | 2 + .../openflowplugin-csit-sanity.yaml | 2 + .../openflowplugin-csit-scalability-old.yaml | 1 + .../openflowplugin-csit-scalability.yaml | 2 + ...csit-scale-stats-collection-daily-frs.yaml | 2 + ...csit-scale-stats-collection-daily-old.yaml | 1 + ...gin-csit-scale-stats-collection-daily.yaml | 2 + ...wplugin-csit-sw-scalability-daily-old.yaml | 1 + ...nflowplugin-csit-sw-scalability-daily.yaml | 2 + .../openflowplugin-patch-test.yaml | 2 + jjb/openflowplugin/openflowplugin.yaml | 4 + jjb/ovsdb/ovsdb-csit-clustering.yaml | 3 + jjb/ovsdb/ovsdb-csit-southbound.yaml | 3 + jjb/ovsdb/ovsdb-full-integration.yaml | 3 + jjb/ovsdb/ovsdb-patch-test.yaml | 2 + jjb/ovsdb/ovsdb.yaml | 4 + jjb/packetcable/packetcable-csit-pcmm.yaml | 3 + jjb/packetcable/packetcable.yaml | 4 + jjb/persistence/persistence.yaml | 3 + jjb/releng-defaults.yaml | 18 +- jjb/releng-macros.yaml | 22 - jjb/releng-templates-java.yaml | 90 --- jjb/reservation/reservation.yaml | 3 + .../sdninterfaceapp-csit-basic.yaml | 3 + jjb/sdninterfaceapp/sdninterfaceapp.yaml | 4 + jjb/sfc/sfc-csit-full-deploy.yaml | 1 + jjb/sfc/sfc-csit-rest-basic.yaml | 3 + jjb/sfc/sfc-patch-test.yaml | 1 + jjb/sfc/sfc.yaml | 4 + jjb/snbi/snbi.yaml | 4 + jjb/snmp/snmp-csit-basic.yaml | 3 + jjb/snmp/snmp.yaml | 4 + jjb/snmp4sdn/snmp4sdn.yaml | 4 + jjb/sxp/sxp-csit-basic.yaml | 3 + jjb/sxp/sxp-csit-cluster-routing.yaml | 1 + jjb/sxp/sxp-csit-clustering.yaml | 2 + jjb/sxp/sxp-csit-filtering.yaml | 3 + jjb/sxp/sxp-csit-performance.yaml | 1 + jjb/sxp/sxp-csit-topology.yaml | 3 + jjb/sxp/sxp.yaml | 4 + jjb/systemmetrics/systemmetrics.yaml | 1 + jjb/tcpmd5/tcpmd5.yaml | 3 + ...opoprocessing-csit-topology-operation.yaml | 3 + jjb/topoprocessing/topoprocessing.yaml | 4 + jjb/transportpce/transportpce.yaml | 1 + jjb/tsdr/tsdr-csit-cassandra.yaml | 3 + jjb/tsdr/tsdr-csit-elasticsearch.yaml | 1 + jjb/tsdr/tsdr-csit-hbase.yaml | 3 + jjb/tsdr/tsdr-csit-hsqldb.yaml | 3 + jjb/tsdr/tsdr.yaml | 4 + jjb/ttp/ttp.yaml | 4 + jjb/unimgr/unimgr-csit-basic.yaml | 3 + jjb/unimgr/unimgr-csit-legato.yaml | 2 + jjb/unimgr/unimgr.yaml | 4 + jjb/usc/usc-csit-channel.yaml | 3 + jjb/usc/usc-csit-tcp.yaml | 3 + jjb/usc/usc-csit-udp.yaml | 2 + jjb/usc/usc.yaml | 4 + jjb/usecplugin/usecplugin-csit-basic.yaml | 3 + jjb/usecplugin/usecplugin.yaml | 4 + jjb/vpnservice/vpnservice.yaml | 1 + jjb/vtn/vtn-csit-3node-manager.yaml | 2 + jjb/vtn/vtn-csit-coordinator.yaml | 3 + jjb/vtn/vtn-csit-manager.yaml | 3 + jjb/vtn/vtn-manager-csit-1node-openstack.yaml | 3 + jjb/vtn/vtn-patch-test.yaml | 2 + jjb/vtn/vtn.yaml | 4 + jjb/yang-push/yang-push.yaml | 4 + jjb/yangide/yangide.yaml | 2 + jjb/yangtools/yangtools-csit-system.yaml | 1 + jjb/yangtools/yangtools.yaml | 4 + 228 files changed, 1710 insertions(+), 879 deletions(-) delete mode 100644 jjb/deploy-distribution-get-vars.sh delete mode 100644 jjb/deploy-distribution.sh rename jjb/integration/{include-raw-integration-deploy-controller-offline.sh => distribution-deploy-offline.sh} (59%) rename jjb/integration/{include-raw-integration-deploy-controller-verify.sh => distribution-deploy-verify.sh} (60%) delete mode 100644 jjb/integration/distribution-jobs.yaml delete mode 100644 jjb/integration/distribution/distribution-check.yaml create mode 100644 jjb/integration/distribution/distribution-jobs.yaml create mode 100644 jjb/integration/distribution/distribution-templates.yaml delete mode 100644 jjb/integration/include-raw-integration-get-bundle-vars.sh create mode 100644 jjb/integration/integration-detect-variables.sh rename jjb/integration/{include-raw-integration-distribution-check.sh => integration-distribution-check.sh} (58%) create mode 100644 jjb/integration/integration-set-variables.sh create mode 100644 jjb/integration/integration-upload-distribution.sh diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 807c91240..7e9c1c2b4 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml index 347af910c..b9b99b998 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index 80722ca46..4c79a92b9 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -19,6 +19,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index 5485dfd94..269dc52e6 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -18,6 +18,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index c8850a361..b50d7b35b 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -15,6 +15,7 @@ - carbon: branch: 'stable/carbon' jdk: 'openjdk8' + karaf-version: karaf3 feature: - authn: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index feb3cb915..010cc886d 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -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 diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index a1c337240..5042a6316 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index ba01d1516..99e2fe1d3 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -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 diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml index 638b914ca..9bfd6f8c0 100644 --- a/jjb/armoury/armoury-csit-basic.yaml +++ b/jjb/armoury/armoury-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml index e40122df4..85b83efe2 100644 --- a/jjb/armoury/armoury.yaml +++ b/jjb/armoury/armoury.yaml @@ -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 diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 452f71d4d..fd36010d1 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -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 diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index bc95076ca..f128bd4d3 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -102,11 +102,12 @@ - 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: @@ -124,6 +125,7 @@ - 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 diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index fee1e77df..2ca72409b 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -15,11 +15,13 @@ 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: diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index c0a15f6c0..992c1008f 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -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. @@ -122,7 +124,7 @@ 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: diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh index c948eb48a..b90d959a7 100644 --- a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh +++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh @@ -17,13 +17,13 @@ NEXUS_STAGING_URL=${ODLNEXUS_STAGING_URL:-$ODLNEXUSPROXY} NEXUSURL=${NEXUS_STAGING_URL}/content/repositories/ -VERSION=$(grep -m2 '' "${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml" | tail -n1 | awk -F'[<|>]' '/version/ { printf $3 }') +VERSION=$(grep -m2 '' "${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. diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 5ae653324..6a63da2c8 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -18,9 +18,11 @@ - 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, @@ -99,11 +102,13 @@ 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, @@ -121,6 +126,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install-features: > odl-restconf, odl-bgpcep-bgp-all, diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 90824d9cb..bfb143431 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -18,9 +18,11 @@ - 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, diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 646e7d754..1ba837742 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -18,13 +18,16 @@ - 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: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index fe238d1e2..106977fff 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -18,13 +18,16 @@ - 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: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 38e2ba0a9..db7976322 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -19,9 +19,11 @@ - 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, diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index dcd0281e9..f7792a3a9 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -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 @@ -113,6 +116,7 @@ project: 'bgpcep' project-name: 'bgpcep' branch: 'stable/beryllium' + karaf-version: karaf3 jdk: openjdk7 jdks: - openjdk7 diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index b171973b8..ac30ab545 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -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' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 7406abbfe..12ad1076a 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -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 diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 6ec561ddc..62294a945 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index f6188adea..a99c63d1a 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -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 diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 34b2e7e7d..95a20a7cf 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -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 diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index 8b965dc8d..ed02d5124 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 373361eb0..fcbbae62b 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -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 diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index c5f74a2ba..dd495752f 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -36,6 +36,7 @@ project-name: 'coe' stream: carbon branch: 'stable/carbon' + karaf-version: karaf3 jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 9be47634b..4bb7e8f2d 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 9bbdf02bf..ba63cef0b 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 004b8e7e2..37172087c 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -18,6 +18,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 3b72db1e1..6956ceb2c 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -18,6 +18,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 6968fd9f3..5a131a293 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -18,6 +18,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml index 0f3dba386..af7ff6109 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml index 0e46ca42a..13f7e0be7 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index a31451ce1..098692793 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index c3dd221ad..8710a4602 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index dbb2dddbc..185482da2 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -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 diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 09860abbf..367ca6e7f 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -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 diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index cdc5d5a93..cd0cab21d 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -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: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index eead0a4fd..902fcacf8 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -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 index 8512d625e..000000000 --- a/jjb/deploy-distribution-get-vars.sh +++ /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 index 934c3a208..000000000 --- a/jjb/deploy-distribution.sh +++ /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 diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index f585f48e3..615ce277b 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index 6efc1c58b..a6f1188fa 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -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 diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml index a7e83e8f1..b770c2150 100644 --- a/jjb/discovery/discovery.yaml +++ b/jjb/discovery/discovery.yaml @@ -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 diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 976feec36..00b31dc66 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -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: diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 0c186f842..427fd1ba7 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -19,6 +19,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 393c2f1a3..aaaf1e7c3 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -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}' diff --git a/jjb/eman/eman-csit-model.yaml b/jjb/eman/eman-csit-model.yaml index 267503c9d..30db058c6 100644 --- a/jjb/eman/eman-csit-model.yaml +++ b/jjb/eman/eman-csit-model.yaml @@ -19,9 +19,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index b6bfbf348..d581efe2e 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -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 diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 39af4df88..cef10f4ed 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -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 diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index a1ec96b8b..789356b9d 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -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 diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 084f7b1bc..ee0de580b 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -19,9 +19,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 6cf71d139..b4167143f 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -15,9 +15,11 @@ - carbon: branch: 'stable/carbon' jdk: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jdk: 'openjdk8' + karaf-version: karaf3 feature: - netvirt: diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 9fa00f16e..5682d12e2 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -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: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index e38eabadc..652bfd524 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -26,14 +26,17 @@ - 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: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 8c5c5e798..1572c3511 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index e7009e390..bf8b00767 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index f575d6456..c69f56706 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index a4b6bdfef..e818a669a 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -17,6 +17,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index f09f9998b..6b5b7805d 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -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 @@ -109,6 +112,7 @@ project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'stable/beryllium' + karaf-version: karaf3 jdk: openjdk7 jdks: - openjdk7 diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 2b0d709ce..2e8f863db 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -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 diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh index 156894f3e..134db1928 100644 --- a/jjb/include-raw-deploy-archives.sh +++ b/jjb/include-raw-deploy-archives.sh @@ -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 diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 575a9fa6a..97a2d5f67 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -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 diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/distribution-deploy-offline.sh similarity index 59% rename from jjb/integration/include-raw-integration-deploy-controller-offline.sh rename to jjb/integration/distribution-deploy-offline.sh index bc525171f..c71eecb8e 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh +++ b/jjb/integration/distribution-deploy-offline.sh @@ -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 diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/distribution-deploy-verify.sh similarity index 60% rename from jjb/integration/include-raw-integration-deploy-controller-verify.sh rename to jjb/integration/distribution-deploy-verify.sh index bd74574da..193d1f944 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh +++ b/jjb/integration/distribution-deploy-verify.sh @@ -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 index c54c64c7c..000000000 --- a/jjb/integration/distribution-jobs.yaml +++ /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 index 4a69d36b1..000000000 --- a/jjb/integration/distribution/distribution-check.yaml +++ /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' diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index f2e5f6b49..756341427 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -18,14 +18,17 @@ - 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 index 000000000..4790f14be --- /dev/null +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -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 index 000000000..b564431c6 --- /dev/null +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -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' diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index b9ff74d8a..9c58a98d5 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -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 diff --git a/jjb/integration/include-raw-integration-compare-distributions.sh b/jjb/integration/include-raw-integration-compare-distributions.sh index ecd77675f..af4d2e882 100644 --- a/jjb/integration/include-raw-integration-compare-distributions.sh +++ b/jjb/integration/include-raw-integration-compare-distributions.sh @@ -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 diff --git a/jjb/integration/include-raw-integration-configure-clustering.sh b/jjb/integration/include-raw-integration-configure-clustering.sh index bad2f7583..ed8e67096 100644 --- a/jjb/integration/include-raw-integration-configure-clustering.sh +++ b/jjb/integration/include-raw-integration-configure-clustering.sh @@ -63,8 +63,8 @@ cat > ${WORKSPACE}/configuration-script.sh < ${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. diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh index 7d3e7963c..d2b182eab 100644 --- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh @@ -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 index a387e0682..000000000 --- a/jjb/integration/include-raw-integration-get-bundle-vars.sh +++ /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 < ${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 index 000000000..009e0fe4b --- /dev/null +++ b/jjb/integration/integration-detect-variables.sh @@ -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" < /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." diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index d7204ed8f..1e9005cd4 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -10,11 +10,21 @@ 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: @@ -259,41 +269,57 @@ 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 @@ -406,22 +432,40 @@ 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 index 000000000..90210ebb3 --- /dev/null +++ b/jjb/integration/integration-set-variables.sh @@ -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" < /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 diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index 42cd51471..31c33e71b 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -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' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 44231502d..63ae08f99 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -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 diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index ef9192d95..169577e4e 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -34,6 +34,7 @@ project-name: 'jsonrpc' stream: carbon branch: 'stable/carbon' + karaf-version: karaf3 jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index db65a17e3..2d14a29de 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 76ecbbb71..bb1fe3955 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index be2d089e9..e899f68b8 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 24dfe9c7a..5bd174ee1 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -15,12 +15,15 @@ - 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: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 4b75a3665..a63e1e46c 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -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 @@ -109,6 +112,7 @@ project: 'l2switch' project-name: 'l2switch' branch: 'stable/beryllium' + karaf-version: karaf3 jdk: openjdk7 jdks: - openjdk7 diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 5d184f202..db0539a76 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index a9acc22d3..dfdeebce7 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -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 diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 45e6dd36e..018ea27a3 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -20,12 +20,15 @@ - 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: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index aab9b0f66..3d1f1ae4b 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index dd9b65b93..02269be4e 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -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 @@ -97,6 +100,7 @@ project: 'lispflowmapping' project-name: 'lispflowmapping' branch: 'stable/beryllium' + karaf-version: karaf3 jdk: openjdk7 jdks: - openjdk7 diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index c91af5044..f2987c5f8 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -18,15 +18,17 @@ - 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: diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 088b60cc8..5ac926ed6 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -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 diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index f40f634b3..a2b2009b3 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 1aacfab22..d4db1a5b2 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -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 diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml index e1e7b27e4..cba91f67f 100644 --- a/jjb/natapp/natapp-csit-basic.yaml +++ b/jjb/natapp/natapp-csit-basic.yaml @@ -19,9 +19,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index d8c10e852..e5c7bb2d7 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -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 diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index f83ef439e..d48097dfd 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index d106107a3..5c28e9ae9 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -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 diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index b7abddaa9..07bf09090 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 4150339bb..1347af9ce 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 6db95f8bd..429f207e5 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index e421e0b39..eb2ada499 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -18,6 +18,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index c05e67317..4c7763258 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -18,9 +18,11 @@ - 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, diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 54a9ec27a..fdf269f68 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -19,9 +19,11 @@ - 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, diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 4e0115749..5dec7553c 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -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 diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index 0fcf193d7..26f190b87 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 4ad177426..8a29a5066 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -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 diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 6d6b9987c..d43930711 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -38,9 +38,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 openstack: - mitaka: diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 498321911..31b405f46 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -59,9 +59,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 openstack: - mitaka: diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index b8e0f72b1..c2665f0dc 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -13,16 +13,19 @@ 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' diff --git a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml index 89acb6be8..7390064d9 100644 --- a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml +++ b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml @@ -16,9 +16,11 @@ - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml index 55fa716e8..0afc21c2d 100644 --- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml @@ -32,9 +32,11 @@ - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 openstack: - mitaka: diff --git a/jjb/netvirt/netvirt-legacy-csit.yaml b/jjb/netvirt/netvirt-legacy-csit.yaml index 3d36c38ef..c1edd3842 100644 --- a/jjb/netvirt/netvirt-legacy-csit.yaml +++ b/jjb/netvirt/netvirt-legacy-csit.yaml @@ -16,9 +16,11 @@ - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index d726c0fba..77d02232f 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -15,10 +15,11 @@ - carbon: branch: 'stable/carbon' jdk: 'openjdk8' - + karaf-version: karaf3 - boron: branch: 'stable/boron' jdk: 'openjdk8' + karaf-version: karaf3 feature: - legacy: diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index dae6114bf..e9941c209 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -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 @@ -112,6 +115,7 @@ project: 'netvirt' project-name: 'netvirt' branch: 'stable/beryllium' + karaf-version: karaf3 jdk: openjdk7 jdks: - openjdk7 @@ -140,6 +144,7 @@ project: 'netvirt' project-name: 'netvirt' branch: 'topic/vpp' + karaf-version: karaf3 distribution_branch: 'master' jdk: openjdk8 jdks: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 4eb63b612..94e6cab88 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -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 diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 7ab0b5a19..22b31f3ac 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -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 diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index ed3e98215..3f92dc6c4 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml index c6db4387b..61ef22ebf 100644 --- a/jjb/nic/nic-csit-vtnrenderer.yaml +++ b/jjb/nic/nic-csit-vtnrenderer.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 51f8a18f0..d01ee081d 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -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 diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index 6b6cc324d..c9a7d8fe7 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -19,9 +19,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index bb5809fb0..ea00461e8 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -19,9 +19,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 728f00bd1..65e1bada2 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -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 diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 35adcbff6..557042406 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -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 diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index 56458ff4a..b8222a6a0 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index c02f9eb5f..5aa4e5c06 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -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 diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index d5242d379..5671a7231 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -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 diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml index 20b399517..f4278fb72 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml index b2d6ee43e..747beac83 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml @@ -20,9 +20,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml index b3f5f2120..95e6917af 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml index bca0ee345..3d751e6ec 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml @@ -20,9 +20,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml index 857cc22a8..baf8cf05a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml index b337e58a4..8400e9bd9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml @@ -20,9 +20,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml index e5d7ea1dd..9c01b85e7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml index 7f249ab4f..bf5df91ad 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml @@ -18,9 +18,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml index c6a78b1e8..d2aca6b97 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index afb19c922..b308f1933 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -20,9 +20,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml index 73641de36..29d207745 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml @@ -18,9 +18,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml index dfd7c749f..1b29b0b1e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index e141f08a8..deba1fa06 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -20,9 +20,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml index 92e477044..ac1a48a78 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index 991b352ef..f5a2f9c05 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -18,9 +18,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml index 790b7153e..70049cd05 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml @@ -16,6 +16,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 41c069444..2305d8275 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -19,9 +19,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml index 9d2d02a4b..4345cf522 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml index 3754da4ae..5a93945e0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml @@ -18,9 +18,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml index 6d8c59884..2a5daf2cb 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml index e7b516437..b7381d782 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml @@ -18,9 +18,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 9e5462c2a..bcc131407 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -19,9 +19,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml index 90c9585cf..8d77c05e7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml index 1d659a4c1..ac59b4f09 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml @@ -20,9 +20,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml index 732b09cb1..9bd657d8c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml @@ -18,9 +18,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml index 74b50e5d6..ffc19f45f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml index 1fe32c1dd..f35f5af71 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml @@ -20,9 +20,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml index f71e99fd8..72e28894d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml @@ -15,6 +15,7 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index a2abd6f3d..7e936dd37 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -18,9 +18,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 2b5b56402..3dcfffb40 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -15,9 +15,11 @@ - carbon: branch: 'stable/carbon' jdk: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jdk: 'openjdk8' + karaf-version: karaf3 feature: - core: diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 8c6c18025..59be99d40 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -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 @@ -106,6 +109,7 @@ project: 'openflowplugin' project-name: 'openflowplugin' branch: 'stable/beryllium' + karaf-version: karaf3 jdk: openjdk7 jdks: - openjdk7 diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 2514943aa..974c83fd0 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -20,12 +20,15 @@ - 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: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 16e13831a..a55e9f8d0 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -20,12 +20,15 @@ - 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: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index bc0c2c723..87fee427e 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -13,16 +13,19 @@ 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' diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 427bdcb46..b5b92f83f 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -14,9 +14,11 @@ - carbon: branch: 'stable/carbon' jdk: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jdk: 'openjdk8' + karaf-version: karaf3 feature: - genius: diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index f16d1652c..52247b8ce 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -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 diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index aa6304a82..e6941bf99 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 7a78a5559..77c9b5bd3 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -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 diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 950a74bec..c84352ed9 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -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 diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index ec0423d5a..0369cf435 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -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 @@ -68,10 +69,11 @@ # 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' @@ -157,13 +159,21 @@ 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 diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index cf1f3a513..b1b8823f8 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -712,25 +712,3 @@ {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 diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index 2db2ec9ae..59a729eab 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -65,96 +65,6 @@ - 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}' diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 48ded16a6..37e2e66a0 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -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 diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index b656769b2..8b31738bf 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 31a7d7084..054c97387 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -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 diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 79746bf45..ba3ee12c0 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -18,6 +18,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index b574a85ba..f6c8678c3 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 0b14612fd..d52ce1081 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -15,6 +15,7 @@ - carbon: branch: 'stable/carbon' jdk: 'openjdk8' + karaf-version: karaf3 feature: - basic: diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index dbac35d27..b82ec9851 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -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 diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 0834978a8..2601fee5e 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -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 diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml index feaadb60c..720213d7b 100644 --- a/jjb/snmp/snmp-csit-basic.yaml +++ b/jjb/snmp/snmp-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 7db03f573..47021f45b 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -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 diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index c70c3a90f..47747815e 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -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 diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 4fc6b2208..8429fcdff 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index eba3bd596..afd64a358 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -18,6 +18,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 4492e7ecb..b651009ed 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -18,9 +18,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index b2ab9b500..4d58157cf 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 39859880b..5b1b39e2b 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -18,6 +18,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index b1a86a774..25edbef3a 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -18,12 +18,15 @@ - 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: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index f233596d6..86b12f343 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -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 diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index a97bf69bd..db349c98c 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -36,6 +36,7 @@ project-name: 'systemmetrics' stream: carbon branch: 'stable/carbon' + karaf-version: karaf3 jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml index d38d6f47d..cd2bb78d2 100644 --- a/jjb/tcpmd5/tcpmd5.yaml +++ b/jjb/tcpmd5/tcpmd5.yaml @@ -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 diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index ebb8a8f48..d8a8881f2 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index fcc51b7af..fa72c749e 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -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 diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 37726167c..b8fff6e13 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -36,6 +36,7 @@ project-name: 'transportpce' stream: carbon branch: 'stable/carbon' + karaf-version: karaf3 jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index fbd793f47..99c9dc322 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index b4dcbf241..674b57b3f 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -19,6 +19,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 54c2ccb7c..bb99a172a 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 4de2fe4dc..401c1e09f 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 127d46273..1b357c77f 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -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 diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 86cfe80ce..e2a549fe1 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -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 diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index f537bcf22..8a5067f27 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml index 973a1a9fc..214c62042 100644 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ b/jjb/unimgr/unimgr-csit-legato.yaml @@ -19,9 +19,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 983333125..12b55668c 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -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 diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 030b52586..402b071b4 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index cd87d4754..675c3b6d0 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/usc/usc-csit-udp.yaml b/jjb/usc/usc-csit-udp.yaml index a503acef2..b827b3700 100644 --- a/jjb/usc/usc-csit-udp.yaml +++ b/jjb/usc/usc-csit-udp.yaml @@ -16,9 +16,11 @@ - boron: branch: 'master' jre: 'openjdk8' + karaf-version: karaf3 - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' + karaf-version: karaf3 install: - only: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 1b9edf438..9e965381d 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -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 diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index dae05f071..c13bbf62c 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index af91d9dbe..8be32ffae 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -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 diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml index 29985c070..debef1f1f 100644 --- a/jjb/vpnservice/vpnservice.yaml +++ b/jjb/vpnservice/vpnservice.yaml @@ -13,6 +13,7 @@ project: 'vpnservice' project-name: 'vpnservice' branch: 'stable/beryllium' + karaf-version: karaf3 jdk: openjdk7 jdks: - openjdk7 diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index 70fac7b56..1e7185d5e 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -19,9 +19,11 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 - boron: branch: 'stable/boron' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index d1df4c731..f1ba019d0 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -19,14 +19,17 @@ - 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: diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index 96d10bcfc..b2b048288 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -19,12 +19,15 @@ - 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: diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml index 6b56eaba8..b9917554a 100644 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -26,12 +26,15 @@ - 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: diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml index 6ce6addca..347fe2deb 100644 --- a/jjb/vtn/vtn-patch-test.yaml +++ b/jjb/vtn/vtn-patch-test.yaml @@ -20,12 +20,14 @@ - 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} diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 377242101..a564d0457 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -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 @@ -106,6 +109,7 @@ project: 'vtn' project-name: 'vtn' branch: 'stable/beryllium' + karaf-version: karaf3 jdk: openjdk7 jdks: - openjdk7 diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 610165962..ee4b308e7 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -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 diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index f6aa2617f..b09ac1a5a 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -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 diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index fbbccaca4..bf59fe140 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -19,6 +19,7 @@ - carbon: branch: 'stable/carbon' jre: 'openjdk8' + karaf-version: karaf3 install: - only: diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index fc0f74584..7e652a520 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -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 -- 2.36.6