From 735b5888b8d82eab624a6a0be41456834fded048 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 15 Sep 2016 14:08:38 -0400 Subject: [PATCH] Remove lithium jobs Now that Boron has been officially released we can remove all the Lithium jobs from our CI system. Change-Id: I6978a7f97e1bf1381ce236222c72a72e614a2452 Signed-off-by: Thanh Ha --- jjb/aaa/aaa-csit-authn.yaml | 3 -- jjb/aaa/aaa-csit-idmlite.yaml | 3 -- jjb/aaa/aaa.yaml | 35 ---------------- jjb/alto/alto-csit-setup.yaml | 3 -- jjb/alto/alto.yaml | 35 ---------------- jjb/autorelease/autorelease-projects.yaml | 5 --- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 6 --- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 3 -- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 3 -- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 3 -- jjb/bgpcep/bgpcep-pcepy.yaml | 2 - jjb/bgpcep/bgpcep.yaml | 37 ---------------- jjb/capwap/capwap-csit-ac.yaml | 3 -- jjb/capwap/capwap.yaml | 35 ---------------- jjb/centinel/centinel-csit-basic.yaml | 3 -- .../controller-csit-clustering-lithium.yaml | 37 ---------------- .../controller-csit-rest-cars-perf.yaml | 3 -- .../controller-csit-rest-clust-cars-perf.yaml | 3 -- jjb/controller/controller.yaml | 36 ---------------- jjb/coretutorials/coretutorials.yaml | 35 ---------------- jjb/didm/didm-csit-discovery.yaml | 3 -- jjb/didm/didm.yaml | 31 -------------- jjb/dlux/dlux.yaml | 31 -------------- jjb/docs/docs.yaml | 31 -------------- .../groupbasedpolicy-csit-3node.yaml | 3 -- .../groupbasedpolicy-csit-6node.yaml | 3 -- .../groupbasedpolicy-csit-clustering.yaml | 3 -- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 31 -------------- .../integration-distribution-jobs.yaml | 3 -- jjb/integration/integration-test-jobs.yaml | 42 ------------------- jjb/iotdm/iotdm-csit-basic.yaml | 3 -- jjb/iotdm/iotdm.yaml | 32 -------------- .../l2switch-csit-host-scalability-daily.yaml | 3 -- jjb/l2switch/l2switch-csit-scalability.yaml | 3 -- jjb/l2switch/l2switch-csit-switch.yaml | 3 -- jjb/l2switch/l2switch.yaml | 31 -------------- jjb/lacp/lacp-csit-lacp.yaml | 3 -- jjb/lacp/lacp.yaml | 31 -------------- ...spflowmapping-csit-all-stable-lithium.yaml | 31 -------------- jjb/lispflowmapping/lispflowmapping.yaml | 33 --------------- ...sal-csit-periodic-dsbenchmark-lithium.yaml | 42 ------------------- jjb/netconf/netconf-scale.yaml | 3 -- jjb/netconf/netconf-userfeatures.yaml | 3 -- jjb/netvirt/netvirt-csit-clustering.yaml | 3 -- jjb/netvirt/netvirt-csit.yaml | 3 -- jjb/neutron/neutron.yaml | 32 -------------- jjb/nic/nic-csit-basic.yaml | 3 -- jjb/nic/nic-csit-vtnrenderer.yaml | 3 -- jjb/nic/nic.yaml | 31 -------------- jjb/odlparent/odlparent.yaml | 36 ---------------- jjb/openflowjava/openflowjava.yaml | 32 -------------- ...k-matic-ds-daily-lithium-redesign-old.yaml | 3 -- ...owplugin-csit-bulk-matic-ds-daily-old.yaml | 3 -- ...sit-cbench-daily-lithium-redesign-old.yaml | 3 -- .../openflowplugin-csit-cbench-daily-old.yaml | 3 -- ...ench-performance-lithium-redesign-old.yaml | 3 -- ...lowplugin-csit-cbench-performance-old.yaml | 3 -- ...-csit-clustering-lithium-redesign-old.yaml | 4 -- .../openflowplugin-csit-clustering-old.yaml | 4 -- ...nfig-performance-lithium-redesign-old.yaml | 4 -- ...lowplugin-csit-config-performance-old.yaml | 4 -- ...it-flow-services-lithium-redesign-old.yaml | 3 -- ...openflowplugin-csit-flow-services-old.yaml | 3 -- ...calability-daily-lithium-redesign-old.yaml | 3 -- ...lugin-csit-link-scalability-daily-old.yaml | 3 -- ...me-measure-daily-lithium-redesign-old.yaml | 3 -- ...lugin-csit-rpc-time-measure-daily-old.yaml | 3 -- ...calability-daily-lithium-redesign-old.yaml | 3 -- ...flowplugin-csit-scalability-daily-old.yaml | 3 -- ...csit-scalability-lithium-redesign-old.yaml | 3 -- .../openflowplugin-csit-scalability-old.yaml | 3 -- ...collection-daily-lithium-redesign-old.yaml | 3 -- ...csit-scale-stats-collection-daily-old.yaml | 3 -- ...calability-daily-lithium-redesign-old.yaml | 3 -- ...wplugin-csit-sw-scalability-daily-old.yaml | 3 -- jjb/openflowplugin/openflowplugin.yaml | 32 -------------- jjb/ovsdb/ovsdb-csit-clustering.yaml | 3 -- jjb/ovsdb/ovsdb-csit-scalability-daily.yaml | 3 -- jjb/ovsdb/ovsdb-csit-southbound.yaml | 3 -- jjb/ovsdb/ovsdb-full-integration.yaml | 5 --- jjb/ovsdb/ovsdb.yaml | 35 ---------------- .../packetcable-csit-pcmm-lithium.yaml | 32 -------------- jjb/packetcable/packetcable.yaml | 31 -------------- jjb/persistence/persistence.yaml | 32 -------------- jjb/reservation/reservation.yaml | 31 -------------- jjb/sdninterfaceapp/sdninterfaceapp.yaml | 32 -------------- jjb/snbi/snbi.yaml | 31 -------------- jjb/snmp/snmp-csit-basic.yaml | 3 -- jjb/snmp/snmp.yaml | 32 -------------- jjb/snmp4sdn/snmp4sdn.yaml | 31 -------------- jjb/sxp/sxp-csit-basic.yaml | 3 -- jjb/sxp/sxp-csit-topology.yaml | 3 -- jjb/sxp/sxp.yaml | 31 -------------- jjb/tcpmd5/tcpmd5.yaml | 32 -------------- jjb/topoprocessing/topoprocessing.yaml | 33 --------------- jjb/tsdr/tsdr-csit-hbase-lithium.yaml | 29 ------------- jjb/tsdr/tsdr-csit-hsqldb-lithium.yaml | 29 ------------- jjb/tsdr/tsdr.yaml | 31 -------------- jjb/ttp/ttp.yaml | 31 -------------- jjb/usc/usc-csit-channel.yaml | 3 -- jjb/usc/usc-csit-tcp.yaml | 3 -- jjb/usc/usc.yaml | 33 --------------- .../vpnservice-csit-vpnservice.yaml | 3 -- jjb/vpnservice/vpnservice.yaml | 32 -------------- jjb/vtn/vtn-csit-coordinator.yaml | 3 -- jjb/vtn/vtn-csit-manager-stable-lithium.yaml | 31 -------------- jjb/vtn/vtn.yaml | 38 ----------------- jjb/yangtools/yangtools.yaml | 36 ---------------- 108 files changed, 1654 deletions(-) delete mode 100644 jjb/controller/controller-csit-clustering-lithium.yaml delete mode 100644 jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml delete mode 100644 jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml delete mode 100644 jjb/packetcable/packetcable-csit-pcmm-lithium.yaml delete mode 100644 jjb/tsdr/tsdr-csit-hbase-lithium.yaml delete mode 100644 jjb/tsdr/tsdr-csit-hsqldb-lithium.yaml delete mode 100644 jjb/vtn/vtn-csit-manager-stable-lithium.yaml diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 2870b2401..e0066f3ad 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml index 3558d90de..8a477ad18 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 5de7c8226..2910fc458 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -103,41 +103,6 @@ email-upstream: '[aaa] [odlparent] [yangtools] [controller]' archive-artifacts: '' -- project: - name: aaa-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'aaa' - project-name: 'aaa' - branch: 'stable/lithium' - 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 e943ef5b0..e94ed2163 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index c1a7286d9..fce3c8328 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -104,41 +104,6 @@ email-upstream: '[alto] [l2switch]' archive-artifacts: '' -- project: - name: alto-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'alto' - project-name: 'alto' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 4fd8d70ea..a1d34bb0d 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -22,11 +22,6 @@ branch: 'stable/beryllium' jdk: 'openjdk7' integration-test: beryllium - - lithium: - next-release-tag: Lithium-SR5 - branch: 'stable/lithium' - jdk: 'openjdk7' - integration-test: stable-lithium project: 'releng/autorelease' archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index ba4cd6c7e..405e7f19e 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: @@ -64,9 +61,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 536b29a70..b11f953d8 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index fd78b28d0..45497959f 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 94e867bea..c64377e91 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/bgpcep/bgpcep-pcepy.yaml b/jjb/bgpcep/bgpcep-pcepy.yaml index 551e0395d..128dbb3fe 100644 --- a/jjb/bgpcep/bgpcep-pcepy.yaml +++ b/jjb/bgpcep/bgpcep-pcepy.yaml @@ -12,8 +12,6 @@ branch: 'stable/boron' - beryllium: branch: 'stable/beryllium' - - stable-lithium: - branch: 'stable/lithium' toxdir: 'pcep/pcepy' project: 'bgpcep' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 2b5e91b4d..7bd3ae1d5 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -108,43 +108,6 @@ archive-artifacts: '' build-node: centos7-java-builder-4c-8g -- project: - name: bgpcep-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'bgpcep' - project-name: 'bgpcep' - build-node: centos7-java-builder-4c-8g - branch: 'stable/lithium' - 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: '' - - project: name: bgpcep-sonar jobs: diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 7300bce14..d52ad4ea0 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 91c4eddd8..cd35bad16 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -104,41 +104,6 @@ email-upstream: '[capwap]' archive-artifacts: '' -- project: - name: capwap-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'capwap' - project-name: 'capwap' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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 d7f754c7f..3aebba377 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/controller/controller-csit-clustering-lithium.yaml b/jjb/controller/controller-csit-clustering-lithium.yaml deleted file mode 100644 index 8dfdf9fc2..000000000 --- a/jjb/controller/controller-csit-clustering-lithium.yaml +++ /dev/null @@ -1,37 +0,0 @@ -- project: - name: controller-csit-clustering-lithium - jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' - - # The project name - project: 'controller' - - # The functionality under test - functionality: 'clustering' - - # Project branches - stream: - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' - - install: - - only: - scope: 'only' - # Bug 4676 means -all- would fail. - - # No tools system VMs needed in JCloud configuration - mininet-vms: 0 - - # Features to install - install-features: 'odl-restconf,odl-clustering-test-app' - - # Robot custom options - robot-options: '' - - # Trigger jobs (upstream dependencies) - trigger-jobs: > - odlparent-distribution-{stream}, - yangtools-distribution-{stream}, - controller-distribution-{stream}, - integration-distribution-merge-{stream} diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 2cc5dc825..b982aef7f 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' 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 e2b1932ce..c0252a7af 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 0010fffba..57803dfd5 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -104,42 +104,6 @@ email-upstream: '[controller] [odlparent] [yangtools] [aaa]' archive-artifacts: '' -- project: - name: controller-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'controller' - project-name: 'controller' - branch: 'stable/lithium' - 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 a1af2d55f..a31a321f4 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -103,41 +103,6 @@ email-upstream: '[coretutorials]' archive-artifacts: '' -- project: - name: coretutorials-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'coretutorials' - project-name: 'coretutorials' - branch: 'stable/lithium' - 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 d2720f816..7976732a1 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index 0bea1c97d..e441b5aa8 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -98,37 +98,6 @@ email-upstream: '[didm]' archive-artifacts: '' -- project: - name: didm-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'didm' - project-name: 'didm' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 843bb7572..9b8f0ef1e 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -98,37 +98,6 @@ email-upstream: '[dlux] [odlparent]' archive-artifacts: '' -- project: - name: dlux-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'dlux' - project-name: 'dlux' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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.yaml b/jjb/docs/docs.yaml index 57207d9d9..806df16ff 100644 --- a/jjb/docs/docs.yaml +++ b/jjb/docs/docs.yaml @@ -98,37 +98,6 @@ email-upstream: '[docs] [odlparent]' archive-artifacts: '' -- project: - name: docs-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'docs' - project-name: 'docs' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 7f146a273..05a4b4097 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 4b9d9680d..cbbd85ee6 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 2833c0609..c29e5dc3c 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index af279be96..b64299988 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -98,37 +98,6 @@ email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' archive-artifacts: '' -- project: - name: groupbasedpolicy-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'groupbasedpolicy' - project-name: 'groupbasedpolicy' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml index 7689729d1..b479d7456 100644 --- a/jjb/integration/integration-distribution-jobs.yaml +++ b/jjb/integration/integration-distribution-jobs.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' - job-template: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 8f082fbac..205314d55 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -170,48 +170,6 @@ vtn-csit-1node-manager-all-{stream}, vtn-csit-1node-coordinator-only-{stream} - - stable-lithium: - branch: 'stable/lithium' - jdk: 'openjdk7' - jre: 'openjdk7' - csit-list: > - aaa-csit-1node-authn-only-{stream}, - aaa-csit-1node-authn-all-{stream}, - bgpcep-csit-1node-userfeatures-only-{stream}, - bgpcep-csit-1node-userfeatures-all-{stream}, - capwap-csit-1node-ac-only-{stream}, - capwap-csit-1node-ac-all-{stream}, - controller-csit-3node-clustering-only-{stream}, - integration-distribution-offline-{stream}, - l2switch-csit-1node-switch-only-{stream}, - l2switch-csit-1node-switch-all-{stream}, - l2switch-csit-1node-scalability-only-{stream}, - l2switch-csit-1node-scalability-all-{stream}, - lispflowmapping-csit-1node-all-only-{stream}, - lispflowmapping-csit-1node-all-all-{stream}, - netconf-csit-1node-userfeatures-all-{stream}, - netconf-csit-1node-userfeatures-only-{stream}, - netvirt-csit-1node-openstack-basic-only-{stream}, - netvirt-csit-1node-openstack-basic-all-{stream}, - nic-csit-1node-basic-all-{stream}, - nic-csit-1node-basic-only-{stream}, - openflowplugin-csit-1node-flow-services-only-{stream}, - openflowplugin-csit-1node-flow-services-all-{stream}, - openflowplugin-csit-1node-scalability-only-{stream}, - openflowplugin-csit-1node-cbench-performance-only-{stream}, - openflowplugin-csit-1node-config-performance-only-{stream}, - ovsdb-csit-1node-southbound-only-{stream}, - ovsdb-csit-1node-southbound-all-{stream}, - snmp-csit-1node-basic-only-{stream}, - snmp-csit-1node-basic-all-{stream}, - usc-csit-1node-channel-only-{stream}, - usc-csit-1node-channel-all-{stream}, - vpnservice-csit-1node-vpnservice-only-{stream}, - vpnservice-csit-1node-vpnservice-all-{stream}, - vtn-csit-1node-manager-li-only-{stream}, - vtn-csit-1node-manager-li-all-{stream}, - vtn-csit-1node-coordinator-only-{stream} - # Template: integration-csit-verify-1node-library # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables) diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index 36d0ed742..bbd76c277 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 2a05241d2..d715ce755 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -98,38 +98,6 @@ email-upstream: '[iotdm] [aaa]' archive-artifacts: '' -- project: - name: iotdm-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'iotdm' - project-name: 'iotdm' - branch: 'stable/lithium' - 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 571843202..f486df602 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 131fbea00..ff12542b5 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 2e8bbd71f..3b36a1452 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 96cbacb91..cede29eda 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -98,37 +98,6 @@ email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' archive-artifacts: '' -- project: - name: l2switch-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'l2switch' - project-name: 'l2switch' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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 c2e1c4b50..7874dd408 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index da994a30d..fbf946375 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -98,37 +98,6 @@ email-upstream: '[lacp] [openflowjava] [openflowplugin]' archive-artifacts: '' -- project: - name: lacp-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'lacp' - project-name: 'lacp' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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-all-stable-lithium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml deleted file mode 100644 index b29048e04..000000000 --- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml +++ /dev/null @@ -1,31 +0,0 @@ -- project: - name: lispflowmapping-csit-all-stable-lithium - jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - # The project name - project: 'lispflowmapping' - - # The functionality under test - functionality: 'all' - - # Project branches - stream: - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' - - install: - - only: - scope: 'only' - - all: - scope: 'all' - - # Features to install - install-features: 'odl-lispflowmapping-all,odl-restconf,odl-mdsal-apidocs' - - # Robot custom options - robot-options: '' - - # Trigger jobs (upstream dependencies) - trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},neutron-distribution-{stream},lispflowmapping-distribution-{stream}' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 8334732a9..014190ceb 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -101,39 +101,6 @@ archive-artifacts: '' build-node: centos7-java-builder-4c-8g -- project: - name: lispflowmapping-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'lispflowmapping' - project-name: 'lispflowmapping' - branch: 'stable/lithium' - 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-periodic-dsbenchmark-lithium.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml deleted file mode 100644 index 200452c6f..000000000 --- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml +++ /dev/null @@ -1,42 +0,0 @@ -- project: - name: mdsal-csit-periodic-dsbenchmark-lithium - jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'mdsal' - - # The functionality under test - functionality: 'dsbenchmark' - - # Project branches - stream: - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' - - install: - - only: - scope: 'only' - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf,odl-dsbenchmark-impl' - - # Robot custom options - robot-options: '' - - # Trigger jobs (daily) - schedule: 'H H * * *' - - # Plot Info - 01-plot-title: 'Performance by structure' - 01-plot-yaxis: 'Average total time [ms]' - 01-plot-group: 'MD-SAL Data Store Performance' - 01-plot-data-file: 'perf_per_struct.csv' - 02-plot-title: 'Performance by operations' - 02-plot-yaxis: 'Average total time [ms]' - 02-plot-group: 'MD-SAL Data Store Performance' - 02-plot-data-file: 'perf_per_ops.csv' - diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index b1f9b4819..d4ec07fbb 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 93f1cdb6b..51ca4f3ce 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/netvirt/netvirt-csit-clustering.yaml b/jjb/netvirt/netvirt-csit-clustering.yaml index b5ce68817..1b9f891f0 100644 --- a/jjb/netvirt/netvirt-csit-clustering.yaml +++ b/jjb/netvirt/netvirt-csit-clustering.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/netvirt/netvirt-csit.yaml b/jjb/netvirt/netvirt-csit.yaml index 51c0a5648..4b11e10b6 100644 --- a/jjb/netvirt/netvirt-csit.yaml +++ b/jjb/netvirt/netvirt-csit.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 631efc8ff..59b8c8aea 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -98,38 +98,6 @@ email-upstream: '[neutron] [odlparent] [aaa]' archive-artifacts: '' -- project: - name: neutron-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'neutron' - project-name: 'neutron' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - - 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/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index 636fe1787..3e2fec7ba 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml index 79855c405..16bf3c786 100644 --- a/jjb/nic/nic-csit-vtnrenderer.yaml +++ b/jjb/nic/nic-csit-vtnrenderer.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index e0f7887d8..610b433ba 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -98,37 +98,6 @@ email-upstream: '[nic] [vtn] [groupbasedpolicy]' archive-artifacts: '' -- project: - name: nic-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'nic' - project-name: 'nic' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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 2b82b6814..c157d14dd 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -104,42 +104,6 @@ email-upstream: '[odlparent]' archive-artifacts: '' -# ODL Releng build templates -- project: - name: odlparent-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'odlparent' - project-name: 'odlparent' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index c5e43a985..12c33b7bf 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -99,38 +99,6 @@ email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' archive-artifacts: '' -- project: - name: openflowjava-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'openflowjava' - project-name: 'openflowjava' - branch: 'stable/lithium' - 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-bulk-matic-ds-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml index 3d2300d2e..4b96c6b89 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml index d31e5ec23..de59d6fc2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml index 285c7aabe..2ae81adbb 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml index baf14a29b..d4c2e22a4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml index 580a5afc8..26090e6a5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml index e6d06b4d6..9369afefc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml index cb45da9bb..f186ba60b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: @@ -30,4 +27,3 @@ # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml index 1d9d608de..99091cfed 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: @@ -30,4 +27,3 @@ # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' - diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml index 4489bf9ba..8f349d87a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: @@ -40,4 +37,3 @@ 02-plot-yaxis: 'seconds' 02-plot-group: 'Stats Collect Performance' 02-plot-data-file: 'times.csv' - diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml index e520f952f..829aaeec7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: @@ -40,4 +37,3 @@ 02-plot-yaxis: 'seconds' 02-plot-group: 'Stats Collect Performance' 02-plot-data-file: 'times.csv' - diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml index 4f1f50f7c..00f01f5ef 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml index 884e824b5..19985f2a0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml index 535cac552..d2cc97b62 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml index 98991e9c4..3431514b2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml index 89117f001..52f9794e9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml index a388f8ffc..5d7c7d92b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml index 5cb7fe936..e81006b22 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml index e8c9fa9f1..2f9a5ef92 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml index e142ac758..0b9aac663 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml index ae41822b2..8e702b6b9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml index b0d242cdb..076bfd75d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml index 4cc6e2d36..2a2854b81 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml index 50cfe2ab2..6c706b37e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml index b7110c043..53c4d574b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml @@ -14,9 +14,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index bb5766648..27e4e37ff 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -98,38 +98,6 @@ email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' archive-artifacts: 'model/*/target/site/**' -- project: - name: openflowplugin-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'openflowplugin' - project-name: 'openflowplugin' - branch: 'stable/lithium' - 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/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 9282deddc..fffaad026 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml index 9cfc0c3a8..01deef60a 100644 --- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml +++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index f3f999a36..5aa9a8af9 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 52cd8fc95..7fe777dc1 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -21,11 +21,6 @@ jdk: openjdk8 jdks: - openjdk8 - - stable-lithium: - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 project: 'ovsdb' archive-artifacts: '*.log' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 8819ff998..428425aa1 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -103,38 +103,3 @@ dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' archive-artifacts: '' - -- project: - name: ovsdb-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'ovsdb' - project-name: 'ovsdb' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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-lithium.yaml b/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml deleted file mode 100644 index 677a03e65..000000000 --- a/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml +++ /dev/null @@ -1,32 +0,0 @@ -- project: - name: packetcable-csit-pcmm-stable-lithium - jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - # The project name - project: 'packetcable' - - # The functionality under test - functionality: 'pcmm' - - # Project branches - stream: - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' - - install: - - only: - scope: 'only' - - all: - scope: 'all' - - # Features to install - install-features: 'odl-packetcable-policy-server' - - # Robot custom options - robot-options: '-v ODL_VERSION:lithium' - - # Trigger jobs (upstream dependencies) - trigger-jobs: > - packetcable-distribution-merge-{stream} diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 82267a6c2..a73ac9693 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -98,37 +98,6 @@ email-upstream: '[packetcable]' archive-artifacts: '' -- project: - name: packetcable-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'packetcable' - project-name: 'packetcable' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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 f6f04f725..531ee28e8 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -100,38 +100,6 @@ email-upstream: '[persistence]' archive-artifacts: '' -- project: - name: persistence-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'persistence' - project-name: 'persistence' - branch: 'stable/lithium' - 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 d1e1b93e0..26f1a3741 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -98,37 +98,6 @@ email-upstream: '[reservation]' archive-artifacts: '' -- project: - name: reservation-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'reservation' - project-name: 'reservation' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 0114bdb78..31a1a1d46 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -98,38 +98,6 @@ email-upstream: '[sdninterfaceapp] [bgpcep]' archive-artifacts: '' -- project: - name: sdninterfaceapp-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - branch: 'stable/lithium' - disable_autorelease: True - disable_distribution_check: True - project: 'sdninterfaceapp' - project-name: 'sdninterfaceapp' - 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/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 40c180b5f..8eb15b688 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -99,37 +99,6 @@ email-upstream: '[snbi]' archive-artifacts: '' -- project: - name: snbi-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'snbi' - project-name: 'snbi' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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 d776758d2..d0ba1ca0d 100644 --- a/jjb/snmp/snmp-csit-basic.yaml +++ b/jjb/snmp/snmp-csit-basic.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 92a2e93ad..527ca9a63 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -98,38 +98,6 @@ email-upstream: '[snmp] [odlparent]' archive-artifacts: '' -- project: - name: snmp-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'snmp' - project-name: 'snmp' - branch: 'stable/lithium' - 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 7efa7de5c..74fb6a8e6 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -98,37 +98,6 @@ email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' archive-artifacts: '' -- project: - name: snmp4sdn-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'snmp4sdn' - project-name: 'snmp4sdn' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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 e184c6b64..076daab65 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 315635679..19e7206c5 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -20,9 +20,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 9b71f8e0b..46df7cfc3 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -98,37 +98,6 @@ email-upstream: '[sxp] [odlparent] [controller] [yangtools]' archive-artifacts: '' -- project: - name: sxp-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'sxp' - project-name: 'sxp' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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 21d9ddc11..fbaeb0699 100644 --- a/jjb/tcpmd5/tcpmd5.yaml +++ b/jjb/tcpmd5/tcpmd5.yaml @@ -100,38 +100,6 @@ email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]' archive-artifacts: '' -- project: - name: tcpmd5-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'tcpmd5' - project-name: 'tcpmd5' - branch: 'stable/lithium' - 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.yaml b/jjb/topoprocessing/topoprocessing.yaml index f678b81eb..83547537c 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -102,39 +102,6 @@ email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' archive-artifacts: '' - -- project: - name: topoprocessing-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'topoprocessing' - project-name: 'topoprocessing' - branch: 'stable/lithium' - 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-hbase-lithium.yaml b/jjb/tsdr/tsdr-csit-hbase-lithium.yaml deleted file mode 100644 index 3cfa948b8..000000000 --- a/jjb/tsdr/tsdr-csit-hbase-lithium.yaml +++ /dev/null @@ -1,29 +0,0 @@ -- project: - name: tsdr-csit-hbase-lithium - jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - # The project name - project: 'tsdr' - - # The functionality under test to verify - functionality: 'hbase-datastore-lithium' - - # Project branches - stream: - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-restconf,odl-tsdr-hbase' - - # Robot custom options - robot-options: '-v ODL_VERSION:stable-lithium' - - # Trigger jobs (upstream dependencies) - trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}' diff --git a/jjb/tsdr/tsdr-csit-hsqldb-lithium.yaml b/jjb/tsdr/tsdr-csit-hsqldb-lithium.yaml deleted file mode 100644 index 9890f05b7..000000000 --- a/jjb/tsdr/tsdr-csit-hsqldb-lithium.yaml +++ /dev/null @@ -1,29 +0,0 @@ -- project: - name: tsdr-csit-hsqldb-lithium - jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - # The project name - project: 'tsdr' - - # The functionality under test to verify - functionality: 'hsqldb-datastore-lithium' - - # Project branches - stream: - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-restconf,odl-tsdr-all' - - # Robot custom options - robot-options: '-v ODL_VERSION:stable-lithium' - - # Trigger jobs (upstream dependencies) - trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 8d7a7c709..293709539 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -98,37 +98,6 @@ email-upstream: '[tsdr]' archive-artifacts: '' -- project: - name: tsdr-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'tsdr' - project-name: 'tsdr' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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 2552a8004..3206832a3 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -98,37 +98,6 @@ email-upstream: '[ttp] [odlparent]' archive-artifacts: '' -- project: - name: ttp-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'ttp' - project-name: 'ttp' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 723d998c1..d31b4ad3e 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 07251d07c..a117d2835 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index bfba955a7..e48a52662 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -98,39 +98,6 @@ email-upstream: '[usc] [controller] [yangtools] [odlparent]' archive-artifacts: '' -- project: - name: usc-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'usc' - project-name: 'usc' - branch: 'stable/lithium' - jdk: openjdk8 - jdks: - - openjdk8 - - openjdk7 - 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/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml index b60525bb3..1f627567b 100644 --- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml +++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml index 381a86e9d..799942d8b 100644 --- a/jjb/vpnservice/vpnservice.yaml +++ b/jjb/vpnservice/vpnservice.yaml @@ -101,38 +101,6 @@ email-upstream: '[vpnservice] [openflowplugin] [neutron]' archive-artifacts: '' -- project: - name: vpnservice-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'vpnservice' - project-name: 'vpnservice' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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: '' - - project: name: vpnservice-sonar jobs: diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 9a0365d90..f1480d61c 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -21,9 +21,6 @@ - beryllium: branch: 'stable/beryllium' jre: 'openjdk7' - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' install: - only: diff --git a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml b/jjb/vtn/vtn-csit-manager-stable-lithium.yaml deleted file mode 100644 index e5f5b888b..000000000 --- a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml +++ /dev/null @@ -1,31 +0,0 @@ -- project: - name: vtn-csit-manager-li - jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - # The project name - project: 'vtn' - - # The functionality under test - functionality: 'manager-li' - - # Project branches - stream: - - stable-lithium: - branch: 'stable/lithium' - jre: 'openjdk7' - - install: - - only: - scope: 'only' - - all: - scope: 'all' - - # Features to install - install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron' - - # Robot custom options - robot-options: '' - - # Trigger jobs (upstream dependencies) - trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}' diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index f990a5d17..f16dab708 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -114,44 +114,6 @@ # https://nexus.opendaylight.org/content/sites/site/ archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' -- project: - name: vtn-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - # stream: release stream (eg. stable-lithium or beryllium) - # branch: git branch (eg. stable/lithium or master) - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - project: 'vtn' - project-name: 'vtn' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - 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/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 1aff468cf..6c86c05dc 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -108,42 +108,6 @@ email-upstream: '[yangtools] [odlparent]' archive-artifacts: '' -- project: - name: yangtools-stable-lithium - jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - stream: - - stable-lithium: - disable_autorelease: True - disable_distribution_check: True - - project: 'yangtools' - project-name: 'yangtools' - branch: 'stable/lithium' - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn31: - mvn-version: '{mvn31}' - - mvn32: - mvn-version: '{mvn32}' - 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