From 8ad961fad6d4a35e7447e62ebf98191795ac82dc Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 29 May 2017 19:33:20 -0400 Subject: [PATCH] Remove unsupported Beryllium jobs Since Carbon has been officially released Beryllium is no longer supported so remove the jobs. Change-Id: Iaef265dc8dbc1bc7be87a0b0bed56bb84cf77c25 Signed-off-by: Thanh Ha --- jjb/aaa/aaa-csit-authn.yaml | 4 -- jjb/aaa/aaa-csit-idmlite.yaml | 4 -- jjb/aaa/aaa.yaml | 28 --------- jjb/alto/alto-csit-setup.yaml | 4 -- jjb/alto/alto.yaml | 29 ---------- jjb/armoury/armoury.yaml | 27 --------- jjb/autorelease/autorelease-macros.yaml | 20 +++---- jjb/autorelease/autorelease-projects.yaml | 8 --- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 37 ------------ jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 5 -- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 5 -- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 14 ----- jjb/bgpcep/bgpcep-pcepy.yaml | 2 - jjb/bgpcep/bgpcep.yaml | 36 ------------ jjb/capwap/capwap-csit-ac.yaml | 4 -- jjb/capwap/capwap.yaml | 29 ---------- jjb/centinel/centinel-csit-basic.yaml | 4 -- jjb/centinel/centinel.yaml | 29 ---------- jjb/controller/controller-csit-akka1.yaml | 4 -- .../controller-csit-clustering.yaml | 4 -- ...ler-csit-periodic-dsbenchmark-cluster.yaml | 4 -- .../controller-csit-periodic-dsbenchmark.yaml | 4 -- .../controller-csit-rest-cars-perf.yaml | 4 -- .../controller-csit-rest-clust-cars-perf.yaml | 4 -- jjb/controller/controller.yaml | 29 ---------- jjb/coretutorials/coretutorials.yaml | 26 --------- jjb/didm/didm-csit-discovery.yaml | 4 -- jjb/didm/didm.yaml | 29 ---------- jjb/discovery/discovery.yaml | 26 --------- jjb/dlux/dlux.yaml | 29 ---------- jjb/docs/docs-rtd.yaml | 2 - jjb/docs/docs.yaml | 37 ------------ jjb/faas/faas.yaml | 29 ---------- ...groupbasedpolicy-csit-1node-openstack.yaml | 5 -- .../groupbasedpolicy-csit-3node.yaml | 4 -- .../groupbasedpolicy-csit-6node.yaml | 4 -- .../groupbasedpolicy-csit-clustering.yaml | 4 -- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 34 ----------- .../distribution-csit-userfeatures.yaml | 6 -- .../distribution/distribution.yaml | 3 - jjb/integration/integration-test-jobs.yaml | 12 ---- jjb/iotdm/iotdm.yaml | 29 ---------- .../l2switch-csit-host-scalability-daily.yaml | 4 -- jjb/l2switch/l2switch-csit-scalability.yaml | 4 -- jjb/l2switch/l2switch-csit-switch.yaml | 4 -- jjb/l2switch/l2switch-patch-test.yaml | 4 -- jjb/l2switch/l2switch.yaml | 34 ----------- jjb/lacp/lacp-csit-lacp.yaml | 4 -- jjb/lacp/lacp.yaml | 29 ---------- .../lispflowmapping-csit-msmr.yaml | 4 -- .../lispflowmapping-csit-performance.yaml | 4 -- jjb/lispflowmapping/lispflowmapping.yaml | 30 ---------- jjb/mdsal/mdsal-csit-bindingv1.yaml | 5 -- jjb/mdsal/mdsal.yaml | 29 ---------- .../messaging4transport-csit-basic.yaml | 4 -- .../messaging4transport.yaml | 29 ---------- jjb/nemo/nemo-csit-engine.yaml | 4 -- jjb/nemo/nemo.yaml | 29 ---------- jjb/netconf/netconf-clustering-scale.yaml | 4 -- jjb/netconf/netconf-clustering.yaml | 4 -- jjb/netconf/netconf-scale.yaml | 11 ---- jjb/netconf/netconf-userfeatures.yaml | 12 ---- jjb/netconf/netconf.yaml | 29 ---------- jjb/netide/netide-csit-basic.yaml | 4 -- jjb/netide/netide.yaml | 29 ---------- jjb/netvirt/netvirt-full-integration.yaml | 6 -- .../netvirt-legacy-csit-clustering.yaml | 4 -- .../netvirt-legacy-csit-multi-openstack.yaml | 4 -- jjb/netvirt/netvirt-legacy-csit.yaml | 4 -- jjb/netvirt/netvirt.yaml | 34 ----------- .../neutron-daily-openstack-beryllium.yaml | 58 ------------------- jjb/neutron/neutron.yaml | 28 --------- jjb/next/next.yaml | 29 ---------- jjb/nic/nic-csit-basic.yaml | 4 -- jjb/nic/nic-csit-vtnrenderer.yaml | 4 -- jjb/nic/nic.yaml | 29 ---------- jjb/odlparent/odlparent.yaml | 29 ---------- jjb/of-config/of-config-csit-basic.yaml | 4 -- jjb/of-config/of-config.yaml | 29 ---------- jjb/ofextensions/circuitsw/circuitsw.yaml | 26 --------- jjb/openflowjava/openflowjava.yaml | 29 ---------- ...-csit-bulkomatic-clustering-daily-old.yaml | 28 --------- ...-bulkomatic-clustering-perf-daily-old.yaml | 46 --------------- ...plugin-csit-bulkomatic-perf-daily-old.yaml | 46 --------------- .../openflowplugin-csit-cbench-daily-old.yaml | 38 ------------ .../openflowplugin-csit-clustering-old.yaml | 28 --------- ...openflowplugin-csit-flow-services-old.yaml | 33 ----------- ...lugin-csit-link-scalability-daily-old.yaml | 41 ------------- .../openflowplugin-csit-longevity-old.yaml | 29 ---------- ...it-restconf-clustering-perf-daily-old.yaml | 45 -------------- ...owplugin-csit-restconf-perf-daily-old.yaml | 45 -------------- .../openflowplugin-csit-scalability-old.yaml | 28 --------- ...csit-scale-stats-collection-daily-old.yaml | 41 ------------- ...wplugin-csit-sw-scalability-daily-old.yaml | 38 ------------ jjb/openflowplugin/openflowplugin.yaml | 33 ----------- jjb/opflex/opflex-custom.yaml | 3 - jjb/opflex/opflex-dependencies.yaml | 8 --- jjb/ovsdb/ovsdb-csit-clustering.yaml | 4 -- jjb/ovsdb/ovsdb-csit-southbound.yaml | 4 -- jjb/ovsdb/ovsdb-full-integration.yaml | 6 -- jjb/ovsdb/ovsdb.yaml | 29 ---------- jjb/packetcable/packetcable-csit-pcmm.yaml | 4 -- jjb/packetcable/packetcable.yaml | 29 ---------- jjb/persistence/persistence.yaml | 27 --------- jjb/reservation/reservation.yaml | 27 --------- .../sdninterfaceapp-csit-basic.yaml | 4 -- jjb/sdninterfaceapp/sdninterfaceapp.yaml | 29 ---------- jjb/sfc/sfc-csit-rest-basic.yaml | 4 -- jjb/sfc/sfc-python.yaml | 2 - jjb/sfc/sfc.yaml | 29 ---------- jjb/snbi/snbi.yaml | 30 ---------- jjb/snmp/snmp-csit-basic.yaml | 4 -- jjb/snmp/snmp.yaml | 29 ---------- jjb/snmp4sdn/snmp4sdn.yaml | 29 ---------- jjb/sxp/sxp-csit-basic.yaml | 4 -- jjb/sxp/sxp-csit-filtering.yaml | 4 -- jjb/sxp/sxp-csit-topology.yaml | 4 -- jjb/sxp/sxp.yaml | 29 ---------- jjb/tcpmd5/tcpmd5.yaml | 29 ---------- ...opoprocessing-csit-topology-operation.yaml | 4 -- jjb/topoprocessing/topoprocessing.yaml | 30 ---------- jjb/tsdr/tsdr-csit-cassandra.yaml | 4 -- jjb/tsdr/tsdr-csit-hbase.yaml | 4 -- jjb/tsdr/tsdr-csit-hsqldb.yaml | 4 -- jjb/tsdr/tsdr.yaml | 29 ---------- jjb/ttp/ttp.yaml | 29 ---------- jjb/unimgr/unimgr-csit-basic.yaml | 4 -- jjb/unimgr/unimgr.yaml | 30 ---------- jjb/usc/usc-csit-channel.yaml | 4 -- jjb/usc/usc-csit-tcp.yaml | 4 -- jjb/usc/usc-csit-udp.yaml | 4 -- jjb/usc/usc.yaml | 29 ---------- jjb/usecplugin/usecplugin-csit-basic.yaml | 4 -- jjb/usecplugin/usecplugin.yaml | 29 ---------- jjb/vpnservice/vpnservice.yaml | 29 ---------- jjb/vtn/vtn-csit-coordinator.yaml | 4 -- jjb/vtn/vtn-csit-manager.yaml | 5 -- jjb/vtn/vtn-manager-csit-1node-openstack.yaml | 4 -- jjb/vtn/vtn.yaml | 33 ----------- jjb/yang-push/yang-push.yaml | 29 ---------- jjb/yangtools/yangtools.yaml | 31 ---------- 141 files changed, 8 insertions(+), 2489 deletions(-) delete mode 100644 jjb/docs/docs.yaml delete mode 100644 jjb/neutron/neutron-daily-openstack-beryllium.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml delete mode 100644 jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml delete mode 100644 jjb/vpnservice/vpnservice.yaml diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 7e9c1c2b4d..61074842ab 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -24,10 +24,6 @@ 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 b9b99b9989..e4dfde64a0 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -24,10 +24,6 @@ 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.yaml b/jjb/aaa/aaa.yaml index 137b7ff43e..9dd3e0e92e 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -83,34 +83,6 @@ email-upstream: '[aaa] [odlparent] [yangtools] [controller]' archive-artifacts: '' -- project: - name: aaa-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'aaa' - project-name: 'aaa' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - archive-artifacts: '' - - project: name: aaa-sonar jobs: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index 5042a63160..a09aedd893 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -23,10 +23,6 @@ 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 8615853d10..e89f8654b2 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -83,35 +83,6 @@ email-upstream: '[alto] [l2switch]' archive-artifacts: '' -- project: - name: alto-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'alto' - project-name: 'alto' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'alto-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - archive-artifacts: '' - - project: name: alto-sonar jobs: diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml index 85b83efe28..c634825191 100644 --- a/jjb/armoury/armoury.yaml +++ b/jjb/armoury/armoury.yaml @@ -79,33 +79,6 @@ email-upstream: '[armoury]' archive-artifacts: '' -- project: - name: armoury-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'armoury' - project-name: 'armoury' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'armoury-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: '' - email-upstream: '[armoury]' - archive-artifacts: '' - - project: name: armoury-sonar jobs: diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 288209521f..a56546875c 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -47,18 +47,14 @@ name: autorelease-determine-merge-order builders: - shell: | - # TODO: Remove this condition once stable/beryllium is no longer - # officially maintained. - if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then - virtualenv --system-site-packages $WORKSPACE/venv - source $WORKSPACE/venv/bin/activate - pip install --upgrade pip - pip install --upgrade networkx - pip freeze - ./scripts/determine-merge-order.py - deactivate - rm -rf $WORKSPACE/venv - fi + virtualenv --system-site-packages $WORKSPACE/venv + source $WORKSPACE/venv/bin/activate + pip install --upgrade pip + pip install --upgrade networkx + pip freeze + ./scripts/determine-merge-order.py + deactivate + rm -rf $WORKSPACE/venv - builder: name: autorelease-maven-deploy diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index c00cfb15c6..293b6c60f4 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -25,14 +25,6 @@ jdk: 'openjdk8' integration-test: boron karaf-version: karaf3 - - beryllium: - # Only run once a week since Beryllium is in maintenance mode - cron: 'H H * * 0' - next-release-tag: Beryllium-SR5 - branch: 'stable/beryllium' - jdk: 'openjdk7' - integration-test: beryllium - karaf-version: karaf3 project: 'releng/autorelease' archive-artifacts: > diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 6a63da2c89..22cda72e99 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -38,25 +38,6 @@ -v REPETITIONS_CHANGE_COUNT_MANY:10 -v MULTIPLICITY_CHANGE_COUNT_MANY:600 -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0 - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-data-change-counter, - odl-bgpcep-bgp-all, - odl-bgpcep-bgp, - odl-netconf-connector-all - robot-options: > - -v USE_NETCONF_CONNECTOR:True - -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:10 - -v REPETITIONS_CHANGE_COUNT_SINGLE:3 - -v CHECK_PERIOD_PREFIX_COUNT_MANY:10 - -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0 - -v REPETITIONS_CHANGE_COUNT_MANY:10 - -v MULTIPLICITY_CHANGE_COUNT_MANY:600 - -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0 install: - only: @@ -123,24 +104,6 @@ -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4 - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-bgp-all, - odl-bgpcep-bgp, - odl-bgpcep-data-change-counter, - odl-netconf-connector-all - robot-options: > - -v USE_NETCONF_CONNECTOR:True - -v COUNT:1000000 - -v INSERT:10 - -v WITHDRAW:9 - -v PREFILL:10 - -v UPDATE:single - -v TEST_DURATION_MULTIPLIER:4 install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 4091f0f639..e33a011534 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -24,11 +24,6 @@ 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: - only: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 106977fffa..1a3580fa35 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -24,11 +24,6 @@ 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: - only: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index db79763228..325969803b 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -34,20 +34,6 @@ odl-bgpcep-bmp, odl-jolokia robot-options: '-v USE_NETCONF_CONNECTOR:True' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-pcep-all, - odl-bgpcep-bgp-all, - odl-bgpcep-bgp, - odl-bgpcep-pcep, - odl-netconf-connector-all, - odl-bgpcep-bmp, - odl-jolokia - robot-options: '-v USE_NETCONF_CONNECTOR:True' install: - only: diff --git a/jjb/bgpcep/bgpcep-pcepy.yaml b/jjb/bgpcep/bgpcep-pcepy.yaml index fa5f963c1b..780ca7050e 100644 --- a/jjb/bgpcep/bgpcep-pcepy.yaml +++ b/jjb/bgpcep/bgpcep-pcepy.yaml @@ -8,8 +8,6 @@ # Pcepy was removed in Carbon. - boron: branch: 'stable/boron' - - beryllium: - branch: 'stable/beryllium' toxdir: 'pcep/pcepy' project: 'bgpcep' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 65fe3a3d85..3904535b56 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -101,42 +101,6 @@ email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' archive-artifacts: '' - -- project: - name: bgpcep-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'bgpcep' - project-name: 'bgpcep' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - mdsal-merge-{stream}, - tcpmd5-merge-{stream} - email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' - archive-artifacts: '' - build-node: centos7-java-builder-4c-8g - - project: name: bgpcep-sonar jobs: diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 62294a9451..dd8982ace7 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -24,10 +24,6 @@ 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 139bff0e8e..e12a336b7f 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -83,35 +83,6 @@ email-upstream: '[capwap]' archive-artifacts: '' -- project: - name: capwap-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'capwap' - project-name: 'capwap' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[capwap]' - archive-artifacts: '' - - project: name: capwap jobs: diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index ed02d51247..9393f90475 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -24,10 +24,6 @@ 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 4ac5b1b5a8..3578774d5f 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -83,35 +83,6 @@ email-upstream: '[centinel]' archive-artifacts: '' -- project: - name: centinel-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'centinel' - project-name: 'centinel' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[centinel]' - archive-artifacts: '' - - project: name: centinel-sonar jobs: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 4bb7e8f2d6..7ab56420f1 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -23,10 +23,6 @@ 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 8778cf5f32..c7812c37d6 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -24,10 +24,6 @@ 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-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml index af7ff61094..1237044500 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -23,10 +23,6 @@ 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 13f7e0be76..8dc7c6492d 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -23,10 +23,6 @@ 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 0986927937..ab43f6f7aa 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -23,10 +23,6 @@ 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 8710a4602b..1d540ac7bc 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -23,10 +23,6 @@ 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 8d1679134a..eccabd913f 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -83,35 +83,6 @@ email-upstream: '[controller] [odlparent] [yangtools] [aaa]' archive-artifacts: '' -- project: - name: controller-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'controller' - project-name: 'controller' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'controller-settings' - mvn-goals: 'clean install -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' - email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - archive-artifacts: '' - - project: name: controller-sonar jobs: diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 367ca6e7f8..cd47f88a7a 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -76,32 +76,6 @@ email-upstream: '[coretutorials]' archive-artifacts: '' -- project: - name: coretutorials-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'coretutorials' - project-name: 'coretutorials' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[coretutorials]' - archive-artifacts: '' - - project: name: coretutorials-sonar jobs: diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index 615ce277b5..a580e0e405 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -24,10 +24,6 @@ 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 97d50d4548..40456efc91 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -83,35 +83,6 @@ email-upstream: '[didm]' archive-artifacts: '' -- project: - name: didm-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'didm' - project-name: 'didm' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'didm-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[didm]' - archive-artifacts: '' - - project: name: didm-sonar jobs: diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml index b770c2150a..25dc63a15a 100644 --- a/jjb/discovery/discovery.yaml +++ b/jjb/discovery/discovery.yaml @@ -76,32 +76,6 @@ email-upstream: '[discovery]' archive-artifacts: '' -- project: - name: discovery-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'discovery' - project-name: 'discovery' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'discovery-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[discovery]' - archive-artifacts: '' - - project: name: discovery-sonar jobs: diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 30568d2f13..35ae5506b8 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -83,35 +83,6 @@ email-upstream: '[dlux] [odlparent]' archive-artifacts: '' -- project: - name: dlux-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'dlux' - project-name: 'dlux' - karaf-version: karaf3 - branch: 'stable/beryllium' - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'dlux-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[dlux] [odlparent]' - archive-artifacts: '' - - project: name: dlux-sonar jobs: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 3fd3f3ce26..6efd20c8d5 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -14,8 +14,6 @@ branch: 'stable/carbon' - boron: branch: 'stable/boron' - - beryllium: - branch: 'stable/beryllium' project: docs project-name: docs diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml deleted file mode 100644 index c1eaeaf38c..0000000000 --- a/jjb/docs/docs.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- project: - name: docs-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'docs' - project-name: 'docs' - branch: 'stable/beryllium' - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'docs-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[docs] [odlparent]' - archive-artifacts: '' - -- project: - name: docs-sonar - jobs: - - '{project-name}-sonar' - project: 'docs' - project-name: 'docs' - branch: 'master' - mvn-settings: 'docs-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index ead4febb2d..22464bc009 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -83,35 +83,6 @@ email-upstream: '[faas]' archive-artifacts: '' -- project: - name: faas-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'faas' - project-name: 'faas' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'faas-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[faas]' - archive-artifacts: '' - - project: name: faas-sonar jobs: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 1f598940fa..6b428fce65 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -33,11 +33,6 @@ 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: - newton: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 1572c35112..4c1f1d26b9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -23,10 +23,6 @@ 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 bf8b007676..b919c85a3f 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -24,10 +24,6 @@ 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 c69f567062..407b8a4b39 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -24,10 +24,6 @@ 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.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 5df8037146..775e870e11 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -98,40 +98,6 @@ email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' archive-artifacts: '' -- project: - name: groupbasedpolicy-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'groupbasedpolicy' - project-name: 'groupbasedpolicy' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean install findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream}, - sfc-merge-{stream}, - ovsdb-merge-{stream} - email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - archive-artifacts: '' - - project: name: groupbasedpolicy-sonar jobs: diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index a7faae5232..e9141edda8 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -26,12 +26,6 @@ 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' # TODO: Add Beryllium when everything is backported there. diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index 057e71ce5d..95bde7137f 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -36,6 +36,3 @@ - boron: branch: stable/boron karaf-version: karaf3 - - beryllium: - branch: stable/beryllium - karaf-version: karaf3 diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 7571988008..aa93723127 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -51,18 +51,6 @@ csit-high-frequency-list: '' schedule-high-frequency: '' - - beryllium: - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: 'openjdk7' - jre: 'openjdk7' - csit-list: '{csit-list-beryllium}' - csit-sanity-list: '' - csit-weekly-list: '' - schedule-weekly: 'H 12 * * 0' - csit-high-frequency-list: '' - schedule-high-frequency: '' - # tools system image tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300 diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 5c81767b21..fd95fe56da 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -83,35 +83,6 @@ email-upstream: '[iotdm] [aaa]' archive-artifacts: '' -- project: - name: iotdm-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'iotdm' - project-name: 'iotdm' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'aaa-merge-{stream}' - email-upstream: '[iotdm] [aaa]' - archive-artifacts: '' - - project: name: iotdm-sonar jobs: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 2d14a29de8..65f36f3bd7 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -23,10 +23,6 @@ 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 bb1fe3955f..09e1051e18 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -23,10 +23,6 @@ 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 e899f68b8d..f7c429d5ca 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -24,10 +24,6 @@ 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 5bd174ee1f..bc670259fa 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -20,10 +20,6 @@ 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 0dd6f35d6b..6880ff7c2f 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -98,40 +98,6 @@ email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' archive-artifacts: '' -- project: - name: l2switch-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'l2switch' - project-name: 'l2switch' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream}, - openflowplugin-merge-{stream} - email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' - archive-artifacts: '' - - project: name: l2switch-sonar jobs: diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index db0539a769..82a0606c96 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -24,10 +24,6 @@ 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 83a935f3ea..e6dbe36804 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -83,35 +83,6 @@ email-upstream: '[lacp] [openflowjava] [openflowplugin]' archive-artifacts: '' -- project: - name: lacp-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'lacp' - project-name: 'lacp' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - mvn-settings: 'lacp-settings' - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' - email-upstream: '[lacp] [openflowjava] [openflowplugin]' - archive-artifacts: '' - - project: name: lacp-sonar jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 018ea27a32..7939eca4ed 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -25,10 +25,6 @@ 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 3d1f1ae4b6..32e42cd963 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -23,10 +23,6 @@ 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 2ed9868a9c..231a07d3cf 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -86,36 +86,6 @@ archive-artifacts: '' build-node: centos7-java-builder-4c-8g -- project: - name: lispflowmapping-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'lispflowmapping' - project-name: 'lispflowmapping' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' - dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' - email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' - archive-artifacts: '' - build-node: centos7-java-builder-4c-8g - - project: name: lispflowmapping-sonar jobs: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index f2987c5f8b..22f9ea8745 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -25,11 +25,6 @@ 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: - only: diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index b73996b0e4..56dd790d8e 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -83,35 +83,6 @@ email-upstream: '[mdsal] [odlparent] [yangtools]' archive-artifacts: '' -- project: - name: mdsal-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'mdsal' - project-name: 'mdsal' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[mdsal] [odlparent] [yangtools]' - archive-artifacts: '' - - project: name: mdsal-sonar jobs: diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index a2b2009b30..8017793965 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -24,10 +24,6 @@ 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 f717d6a9f2..c803def5d1 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -83,35 +83,6 @@ email-upstream: '[messaging4transport]' archive-artifacts: '' -- project: - name: messaging4transport-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'messaging4transport' - project-name: 'messaging4transport' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[messaging4transport]' - archive-artifacts: '' - - project: name: messaging4transport-sonar jobs: diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index d48097dfd9..250277f101 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -24,10 +24,6 @@ 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 d39b71b0f1..40ebc7e20f 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -83,35 +83,6 @@ email-upstream: '[nemo]' archive-artifacts: '' -- project: - name: nemo-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'nemo' - project-name: 'nemo' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[nemo]' - archive-artifacts: '' - - project: name: nemo-sonar jobs: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 1347af9cef..46b1935368 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -23,10 +23,6 @@ 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 429f207e5c..6bc1e94c15 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -23,10 +23,6 @@ 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-scale.yaml b/jjb/netconf/netconf-scale.yaml index 4c7763258d..7ea02b322b 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -30,17 +30,6 @@ odl-netconf-connector-all, odl-netconf-topology robot-options: '-v USE_NETCONF_CONNECTOR:True' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-clustering-test-app, - odl-netconf-mdsal, - odl-netconf-connector-all, - odl-netconf-topology - robot-options: '-v USE_NETCONF_CONNECTOR:True' install: - only: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 2b4c903d40..811c8450fa 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -32,18 +32,6 @@ odl-netconf-connector-all, odl-netconf-topology robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-netconf-mdsal, - odl-mdsal-apidocs, - odl-clustering-test-app, - odl-netconf-connector-all, - odl-netconf-topology - robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True' install: - only: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index aeaa6bf468..75ba7e4c08 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -83,35 +83,6 @@ email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' archive-artifacts: '' -- project: - name: netconf-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'netconf' - project-name: 'netconf' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'netconf-settings' - mvn-goals: 'clean install -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - archive-artifacts: '' - - project: name: netconf-sonar jobs: diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index 26f190b877..365c36f639 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -24,10 +24,6 @@ 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 b61bd457f5..c5e63d5da6 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -83,35 +83,6 @@ email-upstream: '[netide] [openflowjava]' archive-artifacts: '' -- project: - name: netide-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'netide' - project-name: 'netide' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'netide-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream}' - email-upstream: '[netide] [openflowjava]' - archive-artifacts: '' - - project: name: netide-sonar jobs: diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index c2665f0dce..7898183a22 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -20,12 +20,6 @@ jdks: - openjdk8 karaf-version: karaf3 - - beryllium: - branch: 'stable/beryllium' - jdk: openjdk8 - jdks: - - openjdk8 - karaf-version: karaf3 project: 'netvirt' archive-artifacts: '*.log **/target/surefire-reports/*.txt' diff --git a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml index 7390064d9d..b9f23fc7f7 100644 --- a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml +++ b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml @@ -17,10 +17,6 @@ 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 e72b2ade41..ac29d69c46 100644 --- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml @@ -33,10 +33,6 @@ branch: 'stable/boron' jre: 'openjdk8' karaf-version: karaf3 - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 openstack: - newton: diff --git a/jjb/netvirt/netvirt-legacy-csit.yaml b/jjb/netvirt/netvirt-legacy-csit.yaml index c1edd3842d..3e94b1f831 100644 --- a/jjb/netvirt/netvirt-legacy-csit.yaml +++ b/jjb/netvirt/netvirt-legacy-csit.yaml @@ -17,10 +17,6 @@ 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.yaml b/jjb/netvirt/netvirt.yaml index e2a79df84b..aea918ec7f 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -101,40 +101,6 @@ email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]' archive-artifacts: '' -- project: - name: netvirt-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'netvirt' - project-name: 'netvirt' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'netvirt-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' - dependencies: > - neutron-merge-{stream}, - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - ovsdb-merge-{stream}, - sfc-merge-{stream} - email-upstream: '[netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]' - archive-artifacts: '' - - project: name: netvirt-vpp jobs: diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml deleted file mode 100644 index 52282f9f34..0000000000 --- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml +++ /dev/null @@ -1,58 +0,0 @@ ---- -- project: - name: neutron-daily-openstack - jobs: - # TODO: Do we want boron job too? - - 'neutron-daily-openstack-beryllium' - - project: 'neutron' - -- job-template: - name: 'neutron-daily-openstack-beryllium' - - project-type: freestyle - node: centos7-devstack-2c-4g - description: 'Jenkins job to run Tempest tests for the ODL ML2 MechanismDriver on Neutron dummy provider. ' - concurrent: true - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '198' - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '90' - - ssh-agent-credentials: - users: - - 'openstack-gerrit-ssh' - - triggers: - - timed: '@daily' - - builders: - - inject: - properties-content: | - # FIXME: Should *-beryllium job set lithium version? Add a comment why. - ODL_VERSION=lithium-latest - TEMPEST_REGEX=tempest.api.network - KARAFFEATURE=odl-neutron-dummyprovider-test - - shell: !include-raw-escape: include-raw-openstack-ci.sh - - publishers: - - archive: - artifacts: 'logs/**' - fingerprint: false - - email-ext: - subject: '[neutron] $DEFAULT_SUBJECT' - attach-build-log: false - failure: false - unstable: false - fixed: false diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 4f44276fe9..e1547594ac 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -85,34 +85,6 @@ email-upstream: '[neutron] [odlparent] [aaa]' archive-artifacts: '' -- project: - name: neutron-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'neutron' - project-name: 'neutron' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk8 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' - email-upstream: '[neutron] [odlparent] [aaa]' - archive-artifacts: '' - - project: name: neutron-sonar jobs: diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index b34994c21d..cc7883d3e8 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -83,35 +83,6 @@ email-upstream: '[next]' archive-artifacts: '' -- project: - name: next-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'next' - project-name: 'next' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'next-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[next]' - archive-artifacts: '' - - project: name: next-sonar jobs: diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index 3f92dc6c45..fffb923a44 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -24,10 +24,6 @@ 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 61ef22ebf0..be113283a0 100644 --- a/jjb/nic/nic-csit-vtnrenderer.yaml +++ b/jjb/nic/nic-csit-vtnrenderer.yaml @@ -24,10 +24,6 @@ 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 3ec53dc2e9..1ed184d545 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -83,35 +83,6 @@ email-upstream: '[nic] [vtn] [groupbasedpolicy]' archive-artifacts: '' -- project: - name: nic-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'nic' - project-name: 'nic' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'nic-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' - email-upstream: '[nic] [vtn] [groupbasedpolicy]' - archive-artifacts: '' - - project: name: nic-sonar jobs: diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 7076499bd9..672dd969c3 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -85,35 +85,6 @@ email-upstream: '[odlparent]' archive-artifacts: '' -- project: - name: odlparent-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'odlparent' - project-name: 'odlparent' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'odlparent-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[odlparent]' - archive-artifacts: '' - - project: name: odlparent-sonar jobs: diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index b8222a6a0c..32d435eda5 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -24,10 +24,6 @@ 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 d78a9bef35..004bc17ec2 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -83,35 +83,6 @@ email-upstream: '[of-config] [netconf]' archive-artifacts: '' -- project: - name: of-config-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'of-config' - project-name: 'of-config' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: netconf-merge-{stream}' - email-upstream: '[of-config] [netconf]' - archive-artifacts: '' - - project: name: of-config-sonar jobs: diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index ca6bcac41c..8775028260 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -74,32 +74,6 @@ email-upstream: '[circuitsw]' archive-artifacts: '' -- project: - name: circuitsw-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'ofextensions/circuitsw' - project-name: 'circuitsw' - branch: 'stable/beryllium' - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[circuitsw]' - archive-artifacts: '' - - project: name: circuitsw-sonar jobs: diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 9485b8bb10..311d587a8b 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -83,35 +83,6 @@ email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' archive-artifacts: '' -- project: - name: openflowjava-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'openflowjava' - project-name: 'openflowjava' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'openflowjava-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' - archive-artifacts: '' - - project: name: openflowjava-sonar jobs: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml deleted file mode 100644 index f4278fb72e..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- project: - name: openflowplugin-csit-bulkomatic-clustering-daily-old - jobs: - - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'bulkomatic-clustering-daily' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic' - - # Robot custom options - robot-options: '-v ODL_OF_PLUGIN:helium' diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml deleted file mode 100644 index 95e6917af6..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- project: - name: openflowplugin-csit-bulkomatic-clustering-perf-daily-old - jobs: - - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'bulkomatic-clustering-perf-daily' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk8' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Job images - odl_system_flavor: '8 GB General Purpose v1' - - # Features to install - install-features: > - odl-openflowplugin-flow-services-ui, - odl-openflowplugin-app-bulk-o-matic, - odl-jolokia, - decanter-collector-jmx, - decanter-appender-elasticsearch - - # Robot custom options - robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count_per_switch:2000' - - # Plot Info - 01-plot-title: 'Flow Add rate' - 01-plot-yaxis: 'flow_mods/sec' - 01-plot-group: 'Java Performance' - 01-plot-data-file: 'rate.csv' - 02-plot-title: 'Flow Add time' - 02-plot-yaxis: 'seconds' - 02-plot-group: 'Java Performance' - 02-plot-data-file: 'time.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml deleted file mode 100644 index baf8cf05ae..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- project: - name: openflowplugin-csit-bulkomatic-perf-daily-old - jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'bulkomatic-perf-daily' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk8' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Job images - odl_system_flavor: 8 GB General Purpose v1 - - # Features to install - install-features: > - odl-openflowplugin-flow-services-ui, - odl-openflowplugin-app-bulk-o-matic, - odl-jolokia, - decanter-collector-jmx, - decanter-appender-elasticsearch - - # Robot custom options - robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count_per_switch:2000' - - # Plot Info - 01-plot-title: 'Flow Add rate' - 01-plot-yaxis: 'flow_mods/sec' - 01-plot-group: 'Java Performance' - 01-plot-data-file: 'rate.csv' - 02-plot-title: 'Flow Add time' - 02-plot-yaxis: 'seconds' - 02-plot-group: 'Java Performance' - 02-plot-data-file: 'time.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml deleted file mode 100644 index 9c01b85e79..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- project: - name: openflowplugin-csit-cbench-daily-old - jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'cbench-daily' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test' - - # Robot custom options - robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000' - - # Plot Info - 01-plot-title: 'Throughput Mode' - 01-plot-yaxis: 'flow_mods/sec' - 01-plot-group: 'Cbench Performance' - 01-plot-data-file: 'throughput.csv' - 02-plot-title: 'Latency Mode' - 02-plot-yaxis: 'flow_mods/sec' - 02-plot-group: 'Cbench Performance' - 02-plot-data-file: 'latency.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml deleted file mode 100644 index d2aca6b977..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- project: - name: openflowplugin-csit-clustering-old - jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'clustering' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-openflowplugin-flow-services-ui' - - # Robot custom options - robot-options: '-v ODL_OF_PLUGIN:helium' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml deleted file mode 100644 index 1b29b0b1e3..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: openflowplugin-csit-flow-services-old - jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'flow-services' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - all: - scope: 'all' - - # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer' - - # Robot custom options - robot-options: '' - - # mininet image - tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300 diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml deleted file mode 100644 index ac1a48a78c..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- project: - name: openflowplugin-csit-link-scalability-daily-old - jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'link-scalability-daily' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Features to install - install-features: > - odl-openflowplugin-flow-services-ui, - decanter-collector-jmx, - decanter-appender-elasticsearch - - # Robot custom options - robot-options: '' - - # Plot Info - 01-plot-title: 'Maxmum Links Full Mesh Topology' - 01-plot-yaxis: 'Links' - 01-plot-group: 'Link Scalability' - 01-plot-data-file: 'links.csv' - 02-plot-title: 'Topology Discover Time' - 02-plot-yaxis: 'Seconds' - 02-plot-group: 'Link Scalability' - 02-plot-data-file: 'time.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml deleted file mode 100644 index 70049cd055..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- project: - name: openflowplugin-csit-longevity-old - jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - build-timeout: 1440 - - # The functionality under test - functionality: 'longevity' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch' - - # Robot custom options - robot-options: '-v TEST_LENGTH:23h' diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml deleted file mode 100644 index 4345cf5222..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml +++ /dev/null @@ -1,45 +0,0 @@ ---- -- project: - name: openflowplugin-csit-restconf-clustering-perf-daily-old - jobs: - - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'restconf-clustering-perf-daily' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk8' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Job images - odl_system_flavor: 8 GB General Purpose v1 - - # Features to install - install-features: > - odl-openflowplugin-flow-services-ui, - odl-jolokia, - decanter-collector-jmx, - decanter-appender-elasticsearch - - # Robot custom options - robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count:64000' - - # Plot Info - 01-plot-title: 'Flow Add rate' - 01-plot-yaxis: 'flow_mods/sec' - 01-plot-group: 'REST Performance' - 01-plot-data-file: 'rate.csv' - 02-plot-title: 'Flow Add time' - 02-plot-yaxis: 'seconds' - 02-plot-group: 'REST Performance' - 02-plot-data-file: 'time.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml deleted file mode 100644 index 2a5daf2cbb..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml +++ /dev/null @@ -1,45 +0,0 @@ ---- -- project: - name: openflowplugin-csit-restconf-perf-daily-old - jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'restconf-perf-daily' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk8' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Job images - odl_system_flavor: '8 GB General Purpose v1' - - # Features to install - install-features: > - odl-openflowplugin-flow-services-ui, - odl-jolokia, - decanter-collector-jmx, - decanter-appender-elasticsearch - - # Robot custom options - robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count:64000' - - # Plot Info - 01-plot-title: 'Flow Add rate' - 01-plot-yaxis: 'flow_mods/sec' - 01-plot-group: 'REST Performance' - 01-plot-data-file: 'rate.csv' - 02-plot-title: 'Flow Add time' - 02-plot-yaxis: 'seconds' - 02-plot-group: 'REST Performance' - 02-plot-data-file: 'time.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml deleted file mode 100644 index 8d77c05e74..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- project: - name: openflowplugin-csit-scalability-old - jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'scalability' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch' - - # Robot custom options - robot-options: '-v TOPO_TREE_DEPTH:7' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml deleted file mode 100644 index ffc19f45f2..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- project: - name: openflowplugin-csit-scale-stats-collection-daily-old - jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'scale-stats-collection-daily' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Job images - odl_system_flavor: '8 GB General Purpose v1' - - # Features to install - install-features: 'odl-openflowplugin-flow-services-ui' - - # Robot custom options - robot-options: '-v flnr:64000 -v swnr:32 -v fpr:200' - - # Plot Info - 01-plot-title: 'Stats Collection Rate' - 01-plot-yaxis: 'flow_mods/sec' - 01-plot-group: 'Stats Collection Performance' - 01-plot-data-file: 'stats_rate.csv' - 02-plot-title: 'Stats Collection Time' - 02-plot-yaxis: 'seconds' - 02-plot-group: 'Stats Collection Performance' - 02-plot-data-file: 'stats_time.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml deleted file mode 100644 index 72e28894d6..0000000000 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- project: - name: openflowplugin-csit-scalability-daily-old - jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'sw-scalability-daily' - - # Project branches - stream: - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch' - - # Robot custom options - robot-options: '' - - # Plot Info - 01-plot-title: 'Maximum Switches Linear Topology' - 01-plot-yaxis: 'Switches' - 01-plot-group: 'Switch Scalability' - 01-plot-data-file: 'switches.csv' - 02-plot-title: 'Topology Discover Time' - 02-plot-yaxis: 'Seconds' - 02-plot-group: 'Switch Scalability' - 02-plot-data-file: 'time.csv' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 084bb62740..7964c15988 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -95,39 +95,6 @@ email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' archive-artifacts: 'model/*/target/site/**' -- project: - name: openflowplugin-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'openflowplugin' - project-name: 'openflowplugin' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean install javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream} - email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' - archive-artifacts: 'model/*/target/site/**' - - project: name: openflowplugin-sonar jobs: diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index a952b8a7bf..0c8ffa2339 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -15,9 +15,6 @@ - boron: branch: 'stable/boron' jdk: openjdk8 - - beryllium: - branch: 'stable/beryllium' - jdk: openjdk8 project: 'opflex' archive-artifacts: '**/*.tar.gz' diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml index a962234065..1b49ffd13d 100644 --- a/jjb/opflex/opflex-dependencies.yaml +++ b/jjb/opflex/opflex-dependencies.yaml @@ -31,14 +31,6 @@ rapidjson-scm: v1 openvswitch-build: v1 openvswitch-scm: v1 - - beryllium: - branch: 'stable/beryllium' - libuv-build: v1 - libuv-scm: v1 - rapidjson-build: v1 - rapidjson-scm: v1 - openvswitch-build: v1 - openvswitch-scm: v1 project: 'opflex' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 974c83fd05..a101c014c0 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -25,10 +25,6 @@ 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 a55e9f8d06..48ff9f27e5 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -25,10 +25,6 @@ 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 87fee427ed..037c9d58e2 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -20,12 +20,6 @@ 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.yaml b/jjb/ovsdb/ovsdb.yaml index bc243cd2fc..7686aaad58 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -82,32 +82,3 @@ dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' archive-artifacts: '' - -- project: - name: ovsdb-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'ovsdb' - project-name: 'ovsdb' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'ovsdb-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - archive-artifacts: '' diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index e6941bf99e..488e148568 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -24,10 +24,6 @@ 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 4157f74d39..60ecd6791f 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -83,35 +83,6 @@ email-upstream: '[packetcable]' archive-artifacts: '' -- project: - name: packetcable-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'packetcable' - project-name: 'packetcable' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[packetcable]' - archive-artifacts: '' - - project: name: packetcable-sonar jobs: diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index c84352ed9e..06ba70a8a7 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -79,33 +79,6 @@ email-upstream: '[persistence]' archive-artifacts: '' -- project: - name: persistence-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'persistence' - project-name: 'persistence' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[persistence]' - archive-artifacts: '' - - project: name: persistence-sonar jobs: diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 37e2e66a0b..a846568d8c 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -76,33 +76,6 @@ email-upstream: '[reservation]' archive-artifacts: '' -- project: - name: reservation-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'reservation' - project-name: 'reservation' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[reservation]' - archive-artifacts: '' - - project: name: reservation-sonar jobs: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 8b31738bfa..2afb1f5a93 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -24,10 +24,6 @@ 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 73ef1eed08..b480fd3dda 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -83,35 +83,6 @@ email-upstream: '[sdninterfaceapp] [bgpcep]' archive-artifacts: '' -- project: - name: sdninterfaceapp-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'sdninterfaceapp' - project-name: 'sdninterfaceapp' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'bgpcep-merge-{stream}' - email-upstream: '[sdninterfaceapp] [bgpcep]' - archive-artifacts: '' - - project: name: sdninterfaceapp-sonar jobs: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index f6c8678c39..2575427cba 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -24,10 +24,6 @@ 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-python.yaml b/jjb/sfc/sfc-python.yaml index ee2489e762..2b9310d92f 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -14,8 +14,6 @@ branch: 'stable/carbon' - boron: branch: 'stable/boron' - - beryllium: - branch: 'stable/beryllium' project: 'sfc' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 2c32dfe76e..7751399f5a 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -83,35 +83,6 @@ email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' archive-artifacts: '' -- project: - name: sfc-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'sfc' - project-name: 'sfc' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' - email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - archive-artifacts: '' - - project: name: sfc-sonar jobs: diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 13ca70d9c3..9b6ae38881 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -83,36 +83,6 @@ email-upstream: '[snbi]' archive-artifacts: '' - -- project: - name: snbi-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'snbi' - project-name: 'snbi' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[snbi]' - archive-artifacts: '' - - project: name: snbi-sonar jobs: diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml index 720213d7ba..cf6c2e9a41 100644 --- a/jjb/snmp/snmp-csit-basic.yaml +++ b/jjb/snmp/snmp-csit-basic.yaml @@ -24,10 +24,6 @@ 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 44ddc07f24..20c3548c0f 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -83,35 +83,6 @@ email-upstream: '[snmp] [odlparent]' archive-artifacts: '' -- project: - name: snmp-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'snmp' - project-name: 'snmp' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[snmp] [odlparent]' - archive-artifacts: '' - - project: name: snmp-sonar jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 3cf225219f..51d3e480fe 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -84,35 +84,6 @@ email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' archive-artifacts: '' -- project: - name: snmp4sdn-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'snmp4sdn' - project-name: 'snmp4sdn' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - archive-artifacts: '' - - project: name: snmp4sdn-sonar jobs: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 8429fcdffe..b674e06512 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -23,10 +23,6 @@ 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-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 4d58157cf5..ece9b88b2d 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -23,10 +23,6 @@ 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-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 25edbef3ab..6448938d6f 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -23,10 +23,6 @@ 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 32152e1ddd..c32a417d74 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -83,35 +83,6 @@ email-upstream: '[sxp] [odlparent] [controller] [yangtools]' archive-artifacts: '' -- project: - name: sxp-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'sxp' - project-name: 'sxp' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - archive-artifacts: '' - - project: name: sxp-sonar jobs: diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml index cd2bb78d28..d35bdb2a5f 100644 --- a/jjb/tcpmd5/tcpmd5.yaml +++ b/jjb/tcpmd5/tcpmd5.yaml @@ -79,35 +79,6 @@ email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]' archive-artifacts: '' -- project: - name: tcpmd5-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'tcpmd5' - project-name: 'tcpmd5' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'tcpmd5-settings' - mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]' - archive-artifacts: '' - - project: name: tcpmd5-sonar jobs: diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index d8a8881f22..0485111cad 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -24,10 +24,6 @@ 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 7ac5137e08..74eb0fa4ee 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -83,36 +83,6 @@ email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' archive-artifacts: '' - -- project: - name: topoprocessing-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'topoprocessing' - project-name: 'topoprocessing' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' - archive-artifacts: '' - - project: name: topoprocessing-sonar jobs: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 99c9dc322b..ec11739530 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -24,10 +24,6 @@ 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-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index bb99a172a3..325c3420c9 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -24,10 +24,6 @@ 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 401c1e09f9..7300d3a0d3 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -24,10 +24,6 @@ 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 b8e5cd3c8a..494321e7d2 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -83,35 +83,6 @@ email-upstream: '[tsdr]' archive-artifacts: '' -- project: - name: tsdr-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'tsdr' - project-name: 'tsdr' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[tsdr]' - archive-artifacts: '' - - project: name: tsdr-sonar jobs: diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 5a9d13f931..10cffde651 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -83,35 +83,6 @@ email-upstream: '[ttp] [odlparent]' archive-artifacts: '' -- project: - name: ttp-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'ttp' - project-name: 'ttp' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[ttp] [odlparent]' - archive-artifacts: '' - - project: name: ttp-sonar jobs: diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index 8a5067f273..e80aee0b93 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -24,10 +24,6 @@ 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.yaml b/jjb/unimgr/unimgr.yaml index bf9b84e9b8..df1d87f5cd 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -83,36 +83,6 @@ email-upstream: '[unimgr] [ovsdb]' archive-artifacts: '' - -- project: - name: unimgr-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'unimgr' - project-name: 'unimgr' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'ovsdb-merge-{stream}' - email-upstream: '[unimgr] [ovsdb]' - archive-artifacts: '' - - project: name: unimgr-sonar jobs: diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 402b071b47..8679bab957 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -24,10 +24,6 @@ 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 675c3b6d05..fab1687273 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -24,10 +24,6 @@ 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 b827b37005..b6af34d033 100644 --- a/jjb/usc/usc-csit-udp.yaml +++ b/jjb/usc/usc-csit-udp.yaml @@ -17,10 +17,6 @@ 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 7798961f11..8e6fc58f9f 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -83,35 +83,6 @@ email-upstream: '[usc] [controller] [yangtools] [odlparent]' archive-artifacts: '' -- project: - name: usc-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'usc' - project-name: 'usc' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'usc-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' - email-upstream: '[usc] [controller] [yangtools] [odlparent]' - archive-artifacts: '' - - project: name: usc-sonar jobs: diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index c13bbf62c3..3fbd3ebac1 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -24,10 +24,6 @@ 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 67ce4ac851..a2717f3d3f 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -83,35 +83,6 @@ email-upstream: '[usecplugin] [openflowplugin]' archive-artifacts: '' -- project: - name: usecplugin-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'usecplugin' - project-name: 'usecplugin' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[usecplugin] [openflowplugin]' - archive-artifacts: '' - - project: name: usecplugin-sonar jobs: diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml deleted file mode 100644 index debef1f1f7..0000000000 --- a/jjb/vpnservice/vpnservice.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- project: - name: vpnservice-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'vpnservice' - project-name: 'vpnservice' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'vpnservice-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream},neutron-merge-{stream}' - email-upstream: '[vpnservice] [openflowplugin] [neutron]' - archive-artifacts: '' diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index f1ba019d08..20d86d4774 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -26,10 +26,6 @@ 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 b2b0482889..4cb61a3bd1 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -24,11 +24,6 @@ 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: - only: diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml index e6fdab106d..51722ff563 100644 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -31,10 +31,6 @@ branch: 'stable/boron' jre: 'openjdk8' karaf-version: karaf3 - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 openstack: - newton: diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index bf46dcc81f..e3ba2c6c01 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -95,39 +95,6 @@ # https://nexus.opendaylight.org/content/sites/site/ archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' -- project: - name: vtn-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'vtn' - project-name: 'vtn' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'vtn-settings' - mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' - email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' - - # Please do not archive maven sites!!! - # Maven sites are published to Nexus at: - # https://nexus.opendaylight.org/content/sites/site/ - archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' - - project: name: vtn-sonar jobs: diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index d839cb7b92..f21211bdc0 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -83,35 +83,6 @@ email-upstream: '[yang-push]' archive-artifacts: '' -- project: - name: yang-push-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'yang-push' - project-name: 'yang-push' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[yang-push]' - archive-artifacts: '' - - project: name: yang-push-sonar jobs: diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 4aeeea1478..e14bce5bf4 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -85,37 +85,6 @@ email-upstream: '[yangtools] [odlparent]' archive-artifacts: '' -- project: - name: yangtools-beryllium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: beryllium - project: 'yangtools' - project-name: 'yangtools' - branch: 'stable/beryllium' - karaf-version: karaf3 - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn32: - mvn-version: 'mvn32' - - mvn33: - mvn-version: 'mvn33' - mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[yangtools] [odlparent]' - archive-artifacts: '' - - project: name: yangtools-sonar jobs: -- 2.36.6