From a57ec46db9ccee91468eef1ed8cbae15bb971cec Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 15 Oct 2019 20:40:15 +0530 Subject: [PATCH] Remove all fluorine jobs Fluorine is EOL since Sodium released. Remove all fluorine jobs from repo. Change-Id: I9964e7e2cdc50c33d33860e691a1725038e6f31b Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 2 - jjb/aaa/aaa-patch-test.yaml | 3 - jjb/aaa/aaa.yaml | 24 ----- jjb/alto/alto-csit-setup.yaml | 2 - jjb/alto/alto.yaml | 20 ----- jjb/ansible/ansible.yaml | 2 - jjb/archetypes/archetypes.yaml | 23 ----- jjb/autorelease/autorelease-projects.yaml | 3 - .../autorelease-version-management.yaml | 2 - .../validate-autorelease-fluorine.yaml | 43 --------- .../view-autorelease-fluorine.yaml | 42 --------- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 2 - .../bgpcep-csit-bgpclustering-longevity.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 2 - jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 2 - jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 2 - jjb/bgpcep/bgpcep-patch-test.yaml | 2 - jjb/bgpcep/bgpcep.yaml | 31 ------- jjb/bier/bier-csit-basic.yaml | 6 +- jjb/bier/bier.yaml | 21 ----- jjb/coe/coe.yaml | 25 ------ jjb/controller/controller-csit-akka1.yaml | 2 - .../controller-csit-clustering.yaml | 2 - .../controller-csit-cs-chasing-leader.yaml | 2 - .../controller-csit-cs-partnheal.yaml | 2 - ...ontroller-csit-ddb-expl-lead-movement.yaml | 2 - .../controller-csit-dnb-noloss.yaml | 2 - .../controller-csit-drb-partnheal.yaml | 2 - .../controller-csit-drb-precedence.yaml | 2 - .../controller-csit-dsbenchmark-cluster.yaml | 2 - .../controller-csit-dsbenchmark.yaml | 2 - .../controller-csit-rest-cars-perf.yaml | 2 - .../controller-csit-rest-clust-cars-perf.yaml | 2 - jjb/controller/controller-patch-test.yaml | 3 - jjb/controller/controller.yaml | 28 ------ jjb/daexim/daexim-csit-basic.yaml | 2 - jjb/daexim/daexim-csit-clustering-basic.yaml | 2 - jjb/daexim/daexim.yaml | 24 ----- jjb/defaults.yaml | 16 +--- jjb/detnet/detnet.yaml | 24 ----- jjb/dluxapps/dluxapps-csit-yangman.yaml | 2 - jjb/dluxapps/dluxapps.yaml | 20 ----- jjb/docs/docs-rtd.yaml | 2 - jjb/genius/genius-csit-genius.yaml | 28 ------ jjb/genius/genius-patch-test.yaml | 3 - jjb/genius/genius.yaml | 32 ------- ...groupbasedpolicy-csit-1node-openstack.yaml | 3 - .../groupbasedpolicy-csit-3node.yaml | 2 - .../groupbasedpolicy-csit-6node.yaml | 2 - .../groupbasedpolicy-csit-clustering.yaml | 2 - .../groupbasedpolicy-csit-sxp.yaml | 2 - jjb/groupbasedpolicy/groupbasedpolicy.yaml | 27 ------ jjb/honeycomb/vbd/vbd.yaml | 18 ---- jjb/infrautils/infrautils-patch-test.yaml | 3 - jjb/infrautils/infrautils.yaml | 26 ------ jjb/integration/csit-jobs-fluorine.lst | 71 --------------- .../distribution-csit-userfeatures.yaml | 2 - .../distribution/distribution-jobs.yaml | 38 -------- jjb/integration/integration-test-jobs.yaml | 79 ---------------- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 2 - jjb/jsonrpc/jsonrpc.yaml | 18 ---- .../l2switch-csit-host-scalability-daily.yaml | 2 - jjb/l2switch/l2switch-csit-scalability.yaml | 2 - jjb/l2switch/l2switch-csit-switch.yaml | 2 - jjb/l2switch/l2switch-patch-test.yaml | 2 - jjb/l2switch/l2switch.yaml | 24 ----- .../lispflowmapping-csit-msmr.yaml | 2 - .../lispflowmapping-csit-performance.yaml | 2 - jjb/lispflowmapping/lispflowmapping.yaml | 31 ------- jjb/mdsal/mdsal-csit-bindingv1.yaml | 2 - jjb/mdsal/mdsal-patch-test.yaml | 3 - jjb/mdsal/mdsal.yaml | 28 ------ jjb/nemo/nemo-csit-engine.yaml | 2 - jjb/nemo/nemo.yaml | 19 ---- jjb/netconf/netconf-clustering-scale.yaml | 2 - jjb/netconf/netconf-clustering.yaml | 2 - jjb/netconf/netconf-csit-callhome.yaml | 2 - jjb/netconf/netconf-patch-test.yaml | 3 - jjb/netconf/netconf-scale.yaml | 4 - jjb/netconf/netconf-userfeatures.yaml | 2 - jjb/netconf/netconf.yaml | 27 ------ .../netvirt-csit-hwvtep-openstack.yaml | 49 ---------- jjb/netvirt/netvirt-csit-multi-apex.yaml | 2 - .../netvirt-csit-multi-openstack-upgrade.yaml | 3 - jjb/netvirt/netvirt-csit-multi-openstack.yaml | 89 ------------------- jjb/netvirt/netvirt-job-reports.yaml | 6 +- jjb/netvirt/netvirt-patch-test.yaml | 3 - jjb/netvirt/netvirt.yaml | 39 -------- jjb/neutron/neutron-patch-test.yaml | 3 - jjb/neutron/neutron.yaml | 22 ----- jjb/odlparent/odlparent-patch-test.yaml | 3 - jjb/odltools/odltools-csit.yaml | 2 - jjb/odltools/odltools-patch-test.yaml | 2 - jjb/odltools/odltools.yaml | 3 - jjb/of-config/of-config.yaml | 19 ---- ...ugin-csit-bundle-based-reconciliation.yaml | 2 - .../openflowplugin-csit-cbench.yaml | 2 - ...flowplugin-csit-clustering-bulkomatic.yaml | 2 - ...lugin-csit-clustering-perf-bulkomatic.yaml | 2 - .../openflowplugin-csit-clustering.yaml | 2 - .../openflowplugin-csit-flow-services.yaml | 2 - .../openflowplugin-csit-longevity.yaml | 2 - .../openflowplugin-csit-perf-bulkomatic.yaml | 2 - ...flowplugin-csit-perf-stats-collection.yaml | 2 - .../openflowplugin-csit-sanity.yaml | 2 - .../openflowplugin-csit-scale-link.yaml | 2 - .../openflowplugin-csit-scale-switch.yaml | 2 - .../openflowplugin-csit-scale.yaml | 2 - .../openflowplugin-patch-test.yaml | 3 - jjb/openflowplugin/openflowplugin.yaml | 33 ------- jjb/opflex/opflex-custom.yaml | 5 -- jjb/opflex/opflex.yaml | 5 -- jjb/ovsdb/ovsdb-csit-clustering.yaml | 2 - jjb/ovsdb/ovsdb-csit-southbound.yaml | 2 - jjb/ovsdb/ovsdb-full-integration.yaml | 2 - jjb/ovsdb/ovsdb-patch-test.yaml | 3 - jjb/ovsdb/ovsdb.yaml | 26 ------ jjb/p4plugin/p4plugin.yaml | 19 ---- jjb/packaging/build-rpm-snap.sh | 4 +- jjb/packaging/packaging.yaml | 67 -------------- jjb/packaging/test-rpm-docker.sh | 2 +- jjb/packetcable/packetcable-csit-pcmm.yaml | 2 - jjb/packetcable/packetcable.yaml | 19 ---- jjb/serviceutils/serviceutils-patch-test.yaml | 3 - jjb/serviceutils/serviceutils.yaml | 32 ------- jjb/sfc/sfc-csit-full-deploy.yaml | 2 - jjb/sfc/sfc-csit-rest-basic.yaml | 2 - jjb/sfc/sfc-patch-test.yaml | 3 - jjb/sfc/sfc-python.yaml | 2 - jjb/sfc/sfc.yaml | 26 ------ jjb/snmp/snmp.yaml | 18 ---- jjb/snmp4sdn/snmp4sdn.yaml | 23 ----- jjb/sxp/sxp-csit-basic.yaml | 6 -- jjb/sxp/sxp-csit-binding-origin.yaml | 6 -- jjb/sxp/sxp-csit-cluster-binding.yaml | 6 -- jjb/sxp/sxp-csit-clustering.yaml | 6 -- jjb/sxp/sxp-csit-filtering.yaml | 6 -- jjb/sxp/sxp-csit-performance.yaml | 6 -- jjb/sxp/sxp-csit-topology.yaml | 6 -- jjb/sxp/sxp.yaml | 23 ----- jjb/telemetry/telemetry.yaml | 20 ----- jjb/transportpce/transportpce.yaml | 23 ----- jjb/tsdr/tsdr-csit-cassandra.yaml | 6 -- jjb/tsdr/tsdr-csit-elasticsearch.yaml | 6 -- jjb/tsdr/tsdr-csit-hbase.yaml | 6 -- jjb/tsdr/tsdr-csit-hsqldb.yaml | 6 -- jjb/tsdr/tsdr.yaml | 23 ----- jjb/unimgr/unimgr.yaml | 25 ------ jjb/usc/usc-csit-tcp.yaml | 4 - jjb/usc/usc.yaml | 19 ---- jjb/yangtools/yangtools-csit-system.yaml | 2 - jjb/yangtools/yangtools-patch-test.yaml | 3 - 154 files changed, 9 insertions(+), 1708 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-fluorine.yaml delete mode 100644 jjb/autorelease/view-autorelease-fluorine.yaml delete mode 100644 jjb/integration/csit-jobs-fluorine.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 5fad26068..867b909cf 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -15,8 +15,6 @@ stream: - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index c7d58fdb7..83024fb9f 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -17,9 +17,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' feature: - authn: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index b4e2f177e..4a270e221 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -73,30 +73,6 @@ # Used by the release job staging-profile-id: 9318cf3c82c33 -- project: - name: aaa-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: aaa - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/ - rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'aaa' - project-name: 'aaa' - branch: 'stable/fluorine' - mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 9318cf3c82c33 - - project: name: aaa-sonar jobs: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index 09ff941e2..5814a47b9 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 620416c4e..509485f5d 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -60,26 +60,6 @@ # Used by the release job staging-profile-id: 931eabae9693c -- project: - name: alto-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'alto' - project-name: 'alto' - branch: 'stable/fluorine' - build-node: centos7-builder-2c-8g - mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - disable-job: true - - # Used by the release job - staging-profile-id: 931eabae9693c - - project: name: alto-sonar jobs: diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml index c39aba02b..5f8320117 100644 --- a/jjb/ansible/ansible.yaml +++ b/jjb/ansible/ansible.yaml @@ -15,8 +15,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' project: ansible project-name: ansible diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index a7a5f9837..8ae275482 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -71,29 +71,6 @@ # Used by the release job staging-profile-id: d88dcfe6ce48d -- project: - name: archetypes-fluorine - jobs: - - gerrit-maven-clm - - '{project-name}-merge-{stream}': - build-timeout: 180 - cron: '@daily' - mvn-goals: clean install -V -Dmaven.compile.fork=true - - gerrit-maven-stage: - sign-artifacts: true - - odl-maven-verify-jobs - - stream: fluorine - project: 'archetypes' - project-name: 'archetypes' - branch: 'stable/fluorine' - mvn-settings: 'archetypes-settings' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' - email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]' - - # Used by the release job - staging-profile-id: d88dcfe6ce48d - - project: name: archetypes-sonar jobs: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index f891270b9..46c75fbb1 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -20,9 +20,6 @@ - neon: branch: 'stable/neon' integration-test: neon - - fluorine: - branch: 'stable/fluorine' - integration-test: fluorine project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 863a9749f..d31b686c5 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -17,5 +17,3 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' diff --git a/jjb/autorelease/validate-autorelease-fluorine.yaml b/jjb/autorelease/validate-autorelease-fluorine.yaml deleted file mode 100644 index 7a399b56f..000000000 --- a/jjb/autorelease/validate-autorelease-fluorine.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-fluorine - jobs: - - '{project-name}-validate-autorelease-{stream}' - stream: fluorine - branch: stable/fluorine - project-name: - - aaa: - project: aaa - - bgpcep: - project: bgpcep - - controller: - project: controller - - coe: - project: coe - - daexim: - project: daexim - - genius: - project: genius - - infrautils: - project: infrautils - - integration-distribution: - project: integration/distribution - - lispflowmapping: - project: lispflowmapping - - mdsal: - project: mdsal - - netconf: - project: netconf - - netvirt: - project: netvirt - - neutron: - project: neutron - - openflowplugin: - project: openflowplugin - - ovsdb: - project: ovsdb - - serviceutils: - project: serviceutils - - sfc: - project: sfc diff --git a/jjb/autorelease/view-autorelease-fluorine.yaml b/jjb/autorelease/view-autorelease-fluorine.yaml deleted file mode 100644 index fa5d9081a..000000000 --- a/jjb/autorelease/view-autorelease-fluorine.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job -- releng_view: &releng_autorelease_view_common_fluorine - name: releng-view-autorelease-fluorine - view-type: list - filter-executors: false - filter-queue: false - columns: - - status - - weather - - job - - last-success - - last-failure - - last-duration - - build-button - - jacoco - - find-bugs - - robot-list - recurse: false - -- view: - name: Merge-Fluorine - description: 'List of Fluorine Merge jobs for Autorelease' - job-name: - - 'aaa-merge-fluorine' - - 'bgpcep-merge-fluorine' - - 'controller-merge-fluorine' - - 'coe-merge-fluorine' - - 'daexim-merge-fluorine' - - 'genius-merge-fluorine' - - 'infrautils-merge-fluorine' - - 'integration/distribution-merge-fluorine' - - 'lispflowmapping-merge-fluorine' - - 'mdsal-merge-fluorine' - - 'netconf-merge-fluorine' - - 'netvirt-merge-fluorine' - - 'neutron-merge-fluorine' - - 'openflowplugin-merge-fluorine' - - 'ovsdb-merge-fluorine' - - 'serviceutils-merge-fluorine' - - 'sfc-merge-fluorine' - <<: *releng_autorelease_view_common_fluorine diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 109e823f7..023597fe1 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index fa77fa9b0..37bcaa240 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -20,8 +20,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index f2b17e3de..3c287c3ba 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 76fb276cf..40c415b60 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 4da67667d..c2426f069 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index aa4b2072f..56cfa04d7 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index d98e8d871..3e3f54d91 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index d7cd48b41..15d1e0cc2 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -16,8 +16,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' feature: - bgp: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index f3c1f3019..09234977e 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -94,37 +94,6 @@ # Used by the release job staging-profile-id: 9427a05049030 -- project: - name: bgpcep-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: bgpcep - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/ - rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'bgpcep' - project-name: 'bgpcep' - build-node: centos7-builder-8c-8g - build-timeout: 120 - branch: 'stable/fluorine' - mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - mdsal-merge-{stream}, - email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]' - - # Used by the release job - staging-profile-id: 9427a05049030 - - project: name: bgpcep-sonar jobs: diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index a74244dd7..00d53d026 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -21,11 +21,9 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' - verify-stream: 'fluorine' - verify-branch: 'stable/fluorine' + verify-stream: 'neon' + verify-branch: 'stable/neon' verify-karaf-version: 'karaf4' install: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 9a01f1090..b9bbc1d08 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -63,27 +63,6 @@ # Used by the release job staging-profile-id: 942a8075b1f2a -- project: - name: bier-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'bier' - project-name: 'bier' - branch: 'stable/fluorine' - build-node: centos7-builder-2c-8g - build-timeout: 90 - mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m' - dependencies: '' - email-upstream: '[bier]' - disable-job: true - - # Used by the release job - staging-profile-id: 942a8075b1f2a - - project: name: bier-sonar jobs: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index d80a240af..fc4d5ded5 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -76,31 +76,6 @@ # Used by the release job staging-profile-id: 96c0be46aac33 -- project: - name: coe-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: coe - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/ - rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155 - - odl-maven-jobs - - odl-maven-verify-jobs - - project: 'coe' - project-name: 'coe' - stream: fluorine - branch: 'stable/fluorine' - mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[coe] [odlparent] [yangtools] [controller]' - build-node: centos7-docker-2c-8g - - # Used by the release job - staging-profile-id: 96c0be46aac33 - - project: name: coe-sonar jobs: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index f5064107f..c1744ecf1 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -18,8 +18,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 3d11e1bb5..42381f72c 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -17,8 +17,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 33ac88f18..0d3e99feb 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 0007997c3..8a9eadeeb 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 2e39dc6db..6945d2295 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 8889f04a7..6d10daff1 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 6e7f726b5..14b16a89e 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index d301d1b42..ed057052f 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 27f0dc9d5..909683754 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index b2d3db5ba..2437f3aff 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 6d9ea122c..660f6d599 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 9cd259615..995f6f9f4 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 418e62010..898143288 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -17,9 +17,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 3c8f7e492..7815e672d 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -84,34 +84,6 @@ # Used by the release job staging-profile-id: 96c1c9177efdd -- project: - name: controller-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: controller - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/ - rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'controller' - project-name: 'controller' - branch: 'stable/fluorine' - mvn-settings: 'controller-settings' - mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true' - build-node: centos7-builder-8c-8g - build-timeout: 90 - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' - email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - - # Used by the release job - staging-profile-id: 96c1c9177efdd - - project: name: controller-sonar jobs: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 4eaf840da..e7c7948fe 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index e291685ce..9ca289f08 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index f4edd7917..0d0fc2fe5 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -73,30 +73,6 @@ # Used by the release job staging-profile-id: 96e4dade34bd7 -- project: - name: daexim-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: daexim - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/ - rtd-token: 76284f12638574f131cdccdf257d852d07c195fc - - odl-maven-jobs - - odl-maven-verify-jobs - - project: 'daexim' - project-name: 'daexim' - stream: fluorine - branch: 'stable/fluorine' - mvn-settings: 'daexim-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[daexim] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96e4dade34bd7 - - project: name: daexim-sonar jobs: diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 95bdfdce7..f4b36978e 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -95,9 +95,9 @@ # Data for csit-verify jobs # Branch for "last" version detection - verify-branch: stable/fluorine + verify-branch: stable/neon # Value for ODL_STREAM - verify-stream: fluorine + verify-stream: neon verify-karaf-version: karaf4 verify-jdkversion: openjdk8 @@ -188,9 +188,6 @@ csit-sanity-list-neon: > openflowplugin-csit-1node-sanity-only-neon, distribution-sanity-neon - csit-sanity-list-fluorine: > - openflowplugin-csit-1node-sanity-only-fluorine, - distribution-sanity-fluorine csit-weekly-list-magnesium: > controller-csit-1node-notifications-longevity-only-magnesium, controller-csit-3node-drb-partnheal-longevity-only-magnesium, @@ -218,12 +215,3 @@ distribution-deploy-neon, distribution-offline-neon, openflowplugin-csit-1node-longevity-only-neon - csit-weekly-list-fluorine: > - controller-csit-1node-notifications-longevity-only-fluorine, - controller-csit-3node-drb-partnheal-longevity-only-fluorine, - controller-csit-3node-drb-precedence-longevity-only-fluorine, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-fluorine, - bgpcep-csit-3node-bgpclustering-longevity-only-fluorine, - distribution-deploy-fluorine, - distribution-offline-fluorine, - openflowplugin-csit-1node-longevity-only-fluorine diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml index eeabc40ac..d4723919b 100644 --- a/jjb/detnet/detnet.yaml +++ b/jjb/detnet/detnet.yaml @@ -24,30 +24,6 @@ # Used by the release job staging-profile-id: 8981976d0fea7 -- project: - name: detnet-sodium - jobs: - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: detnet - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/ - rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: 'detnet' - project-name: 'detnet' - branch: 'stable/sodium' - mvn-settings: 'detnet-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[detnet] [odlparent] [yangtools] [controller]' - build-node: centos7-docker-2c-8g - - # Used by the release job - staging-profile-id: 8981976d0fea7 - - project: name: detnet-sonar jobs: diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index a539ccae7..162d6d93f 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 60c373bb0..485570b5c 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -60,26 +60,6 @@ # Used by the release job staging-profile-id: 96e6fb1e65bf9 -- project: - name: dluxapps-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - project: 'dluxapps' - project-name: 'dluxapps' - stream: fluorine - branch: 'stable/fluorine' - build-node: centos7-builder-2c-8g - mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' - disable-job: true - - # Used by the release job - staging-profile-id: 96e6fb1e65bf9 - - project: name: dluxapps-sonar jobs: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 9471e1df6..b61f6b06f 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' project: docs project-name: docs diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 8daeff5ce..ac90a6e0c 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -23,8 +23,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: @@ -34,29 +32,3 @@ install-features: 'odl-genius-rest' robot-options: '-v FAIL_ON_EXCEPTIONS:False' - -- project: - name: genius-csit-genius-verify - jobs: - - inttest-csit-verify-1node - - inttest-csit-verify-3node - - project: 'genius' - - functionality: 'verify' - - stream: - - fluorine: - branch: 'master' - - verify-stream: 'neon' - verify-branch: 'stable/neon' - verify-karaf-version: 'karaf4' - - install: - - only: - scope: 'only' - - tools_system_count: 3 - - install-features: 'odl-genius-rest' diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index d61f6ceef..b1b96a8fb 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -17,9 +17,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' feature: - netvirt: diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index d8ccd698b..ae5e22a81 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -106,38 +106,6 @@ # Used by the release job staging-profile-id: 96fb4b6d9d1ee -- project: - name: genius-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: genius - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ - rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'genius' - project-name: 'genius' - branch: 'stable/fluorine' - build-node: centos7-builder-2c-8g - mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m' - build-timeout: 90 - dependencies: > - controller-merge-{stream}, - yangtools-merge-{stream}, - odlparent-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream} - email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' - - # Used by the release job - staging-profile-id: 96fb4b6d9d1ee - - project: name: genius-sonar jobs: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index ef7bb3cf6..b232113d6 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -28,9 +28,6 @@ - neon: branch: 'stable/neon' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - - fluorine: - branch: 'stable/fluorine' - install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' openstack: - queens: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 55c545e4c..fbd23e6ad 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -20,8 +20,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 571420bfd..e32e60d69 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 769973843..78462910d 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index 9236a74b0..af0df03a3 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 5eac9bdaf..dcec8895c 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -81,33 +81,6 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 -- project: - name: groupbasedpolicy-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'groupbasedpolicy' - project-name: 'groupbasedpolicy' - branch: 'stable/fluorine' - build-node: centos7-builder-2c-8g - mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m' - build-timeout: 90 - dependencies: > - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream}, - sfc-merge-{stream}, - ovsdb-merge-{stream} - email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - disable-job: true - - # Used by the release job - staging-profile-id: 96fbb93f95a76 - - project: name: groupbasedpolicy-sonar jobs: diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index f60f1431e..b6956c821 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -54,24 +54,6 @@ # Used by the release job staging-profile-id: 96fc362c36862 -- project: - name: vbd-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'honeycomb/vbd' - project-name: 'vbd' - branch: 'stable/fluorine' - mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m' - dependencies: '' - email-upstream: '[vbd]' - - # Used by the release job - staging-profile-id: 96fc362c36862 - - project: name: vbd-sonar jobs: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index e8d8df135..d39b795f2 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -16,9 +16,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 8232415ae..d3859f04b 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -79,32 +79,6 @@ # Used by the release job staging-profile-id: 96fca0367756c -- project: - name: infrautils-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - doc-dir: .tox/docs/tmp/html - project-pattern: infrautils - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/ - rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9 - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'infrautils' - project-name: 'infrautils' - branch: 'stable/fluorine' - mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[infrautils] [odlparent]' - - # Used by the release job - staging-profile-id: 96fca0367756c - - project: name: infrautils-sonar jobs: diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst deleted file mode 100644 index 89aafe91a..000000000 --- a/jjb/integration/csit-jobs-fluorine.lst +++ /dev/null @@ -1,71 +0,0 @@ -aaa-csit-1node-authn-all-fluorine, -bgpcep-csit-1node-bgp-ingest-all-fluorine, -bgpcep-csit-1node-bgp-ingest-mixed-all-fluorine, -bgpcep-csit-1node-throughpcep-all-fluorine, -bgpcep-csit-1node-userfeatures-all-fluorine, -bgpcep-csit-3node-bgpclustering-all-fluorine, -bgpcep-csit-3node-bgpclustering-ha-only-fluorine, -controller-csit-1node-akka1-all-fluorine, -controller-csit-1node-benchmark-all-fluorine, -controller-csit-1node-rest-cars-perf-all-fluorine, -controller-csit-3node-benchmark-all-fluorine, -controller-csit-3node-clustering-ask-all-fluorine, -controller-csit-3node-clustering-tell-all-fluorine, -controller-csit-3node-rest-clust-cars-perf-ask-only-fluorine, -controller-csit-3node-rest-clust-cars-perf-tell-only-fluorine, -daexim-csit-1node-basic-only-fluorine, -daexim-csit-3node-clustering-basic-only-fluorine, -distribution-csit-1node-userfeatures-all-fluorine, -distribution-csit-managed-fluorine, -genius-csit-1node-upstream-only-fluorine, -genius-csit-3node-upstream-only-fluorine, -lispflowmapping-csit-1node-msmr-all-fluorine, -lispflowmapping-csit-1node-performance-only-fluorine, -lispflowmapping-csit-3node-msmr-all-fluorine, -mdsal-csit-1node-bindingv1-only-fluorine, -netconf-csit-1node-callhome-only-fluorine, -netconf-csit-1node-scale-max-devices-only-fluorine, -netconf-csit-1node-scale-only-fluorine, -netconf-csit-1node-userfeatures-all-fluorine, -netconf-csit-3node-clustering-only-fluorine, -netconf-csit-3node-clustering-scale-only-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-fluorine, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-fluorine, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-fluorine, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-fluorine, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-fluorine, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-fluorine, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-fluorine, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-fluorine, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-fluorine, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-fluorine, -netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine, -netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine, -odltools-csit-1node-upstream-all-fluorine, -openflowplugin-csit-1node-bundle-based-reconciliation-all-fluorine, -openflowplugin-csit-1node-cbench-only-fluorine, -openflowplugin-csit-1node-flow-services-all-fluorine, -openflowplugin-csit-1node-perf-bulkomatic-only-fluorine, -openflowplugin-csit-1node-perf-stats-collection-only-fluorine, -openflowplugin-csit-1node-scale-link-only-fluorine, -openflowplugin-csit-1node-scale-only-fluorine, -openflowplugin-csit-1node-scale-switch-only-fluorine, -openflowplugin-csit-3node-clustering-bulkomatic-only-fluorine, -openflowplugin-csit-3node-clustering-only-fluorine, -openflowplugin-csit-3node-clustering-perf-bulkomatic-only-fluorine, -ovsdb-csit-1node-upstream-southbound-all-fluorine, -ovsdb-csit-3node-upstream-clustering-only-fluorine, -sfc-csit-3node-docker-full-deploy-all-fluorine, -sfc-csit-3node-rest-basic-all-fluorine, -yangtools-csit-1node-system-only-fluorine, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index bf52804f8..440077193 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 356241a77..5b56cd4e4 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -45,17 +45,6 @@ odl-transportpce, odl-transportpce-api, odl-transportpce-ordmodels - - fluorine: - branch: 'stable/fluorine' - karaf-version: odl - # Self-Managed projects repos and features: - sm-repos: > - mvn:org.opendaylight.transportpce/features-transportpce//xml/features - sm-features: > - odl-transportpce, - odl-transportpce-api, - odl-transportpce-ordmodels, - odl-transportpce-stubmodels - project: name: distribution-managed @@ -136,25 +125,6 @@ ovsdb-merge-{stream}, serviceutils-merge-{stream}, sfc-merge-{stream} - - fluorine: - branch: 'stable/fluorine' - dependencies: > - aaa-merge-{stream}, - bgpcep-merge-{stream}, - coe-merge-{stream}, - controller-merge-{stream}, - daexim-merge-{stream}, - genius-merge-{stream}, - infrautils-merge-{stream}, - lispflowmapping-merge-{stream}, - mdsal-merge-{stream}, - netconf-merge-{stream}, - netvirt-merge-{stream} - neutron-merge-{stream}, - openflowplugin-merge-{stream}, - ovsdb-merge-{stream}, - serviceutils-merge-{stream}, - sfc-merge-{stream} - project: name: distribution-full @@ -195,12 +165,6 @@ dependencies: > distribution-merge-managed-{stream}, transportpce-merge-{stream} - - fluorine: - branch: 'stable/fluorine' - karaf-version: odl - dependencies: > - distribution-merge-managed-{stream}, - transportpce-merge-{stream} - project: name: distribution-release @@ -227,8 +191,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' - project: name: distribution-sonar diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 4a87cf4f3..d3b8cab99 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -46,15 +46,6 @@ daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt bgpcep integration/distribution - - fluorine: - branch: 'stable/fluorine' - mvn-version: 'mvn35' - csit-list: !include: csit-jobs-fluorine.lst - build-order: > - odlparent yangtools infrautils mdsal controller serviceutils aaa netconf - daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt - bgpcep integration/distribution - - project: name: integration-distribution project: integration/test @@ -102,18 +93,6 @@ last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used csit-list: !include: csit-jobs-neon.lst csit-weekly-list: '{csit-weekly-list-neon}' - - fluorine: - branch: 'stable/fluorine' - csit-blacklist: > - alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo - of-config p4plugin packetcable sxp telemetry tsdr unimgr usc - gate longevity sanity tdd tempest wip - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct - netvirt-csit-3node-1cmb - last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used - csit-list: !include: csit-jobs-fluorine.lst - csit-weekly-list: '{csit-weekly-list-fluorine}' - project: name: integration-sanity @@ -135,10 +114,6 @@ branch: 'stable/neon' karaf-version: odl csit-sanity-list: '{csit-sanity-list-neon}' - - fluorine: - branch: 'stable/fluorine' - karaf-version: odl - csit-sanity-list: '{csit-sanity-list-fluorine}' - job-template: name: 'integration-merge-dashboard' @@ -597,60 +572,6 @@ - project-view project-name: integration -- view: - name: csit-stable-f - description: 'List of stable integration jobs for managed projects' - job-name: - - aaa-csit-1node-authn-all-fluorine - - bgpcep-csit-1node-throughpcep-all-fluorine - - coe-csit-1node-container-networking-only-fluorine - - controller-csit-1node-akka1-all-fluorine - - controller-csit-1node-benchmark-all-fluorine - - controller-csit-1node-notifications-longevity-only-fluorine - - controller-csit-1node-rest-cars-perf-all-fluorine - - controller-csit-3node-benchmark-all-fluorine - - controller-csit-3node-drb-precedence-longevity-only-fluorine - - controller-csit-3node-rest-clust-cars-perf-ask-only-fluorine - - controller-csit-3node-rest-clust-cars-perf-tell-only-fluorine - - daexim-csit-1node-basic-only-fluorine - - daexim-csit-3node-clustering-basic-only-fluorine - - distribution-csit-1node-userfeatures-all-fluorine - - genius-csit-1node-upstream-only-fluorine - - genius-csit-3node-upstream-only-fluorine - - lispflowmapping-csit-1node-msmr-all-fluorine - - netconf-csit-1node-callhome-only-fluorine - - netconf-csit-1node-userfeatures-all-fluorine - - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-fluorine - - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine - - openflowplugin-csit-1node-flow-services-all-fluorine - - openflowplugin-csit-1node-longevity-only-fluorine - - openflowplugin-csit-1node-perf-bulkomatic-only-fluorine - - openflowplugin-csit-1node-perf-stats-collection-only-fluorine - - openflowplugin-csit-1node-sanity-only-fluorine - - openflowplugin-csit-1node-scale-link-only-fluorine - - openflowplugin-csit-1node-scale-only-fluorine - - openflowplugin-csit-1node-scale-switch-only-fluorine - - openflowplugin-csit-3node-clustering-bulkomatic-only-fluorine - - openflowplugin-csit-3node-clustering-only-fluorine - - ovsdb-csit-3node-upstream-clustering-only-fluorine - - sfc-csit-3node-docker-full-deploy-all-fluorine - - sfc-csit-3node-rest-basic-all-fluorine - view-type: list - filter-executors: false - filter-queue: false - columns: - - status - - weather - - job - - last-success - - last-failure - - last-duration - - build-button - - jacoco - - find-bugs - - robot-list - recurse: false - - view: name: csit-stable-ne description: 'List of stable integration jobs for managed projects' diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 072e29560..2626339c5 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -22,8 +22,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 874cd397e..fd1d902c8 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -69,24 +69,6 @@ # Used by the release job staging-profile-id: 96fdf4408765d -- project: - name: jsonrpc-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - project: 'jsonrpc' - project-name: 'jsonrpc' - stream: fluorine - branch: 'stable/fluorine' - mvn-settings: 'jsonrpc-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' - email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' - - # Used by the release job - staging-profile-id: 96fdf4408765d - - project: name: jsonrpc-sonar jobs: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 634a48581..c98b2e4ec 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -20,8 +20,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index fc8cd0325..6263547c9 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -20,8 +20,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 094d4fa24..c80044e17 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 655a2e310..a2d0fa8fb 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -19,8 +19,6 @@ os-branch: 'queens' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' feature: - all: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 173a66549..1253ed552 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -72,30 +72,6 @@ # Used by the release job staging-profile-id: 96fee85953ca0 -- project: - name: l2switch-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'l2switch' - project-name: 'l2switch' - branch: 'stable/fluorine' - mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -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]' - disable-job: true - - # Used by the release job - staging-profile-id: 96fee85953ca0 - - project: name: l2switch-sonar jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 0ac20cb59..a73f0402a 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index ad612a7d3..a5f30b476 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 54e443ac1..47b95303a 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -98,37 +98,6 @@ # Used by the release job staging-profile-id: 96fff2503b766 -- project: - name: lispflowmapping-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: lispflowmapping - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/ - rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8 - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'lispflowmapping' - project-name: 'lispflowmapping' - branch: 'stable/fluorine' - mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -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: > - **/*.log - **/target/surefire-reports/*-output.txt - - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: 96fff2503b766 - - project: name: lispflowmapping-sonar jobs: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 9f34180d8..44da788e2 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index 3b49e2316..87a3cbd2b 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -17,9 +17,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index b588b6893..0d524a423 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -98,34 +98,6 @@ # Used by the release job staging-profile-id: a674173c7b29d -- project: - name: mdsal-fluorine - jobs: - - '{project-name}-distribution-check-{stream}': - mvn-version: 'mvn35' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: mdsal - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/ - rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002 - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'mdsal' - project-name: 'mdsal' - branch: 'stable/fluorine' - mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' - mvn-opts: '-Xmx2048m' - build-node: centos7-builder-8c-8g - build-timeout: 90 - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[mdsal] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a674173c7b29d - - project: name: mdsal-sonar jobs: diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index dc92bd075..b6c6f3b58 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 6de9899b7..7489622dd 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a67a9890f6202 -- project: - name: nemo-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'nemo' - project-name: 'nemo' - branch: 'stable/fluorine' - mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m' - dependencies: '' - email-upstream: '[nemo]' - disable-job: true - - # Used by the release job - staging-profile-id: a67a9890f6202 - - project: name: nemo-sonar jobs: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index a59ae1593..64c987eb9 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 843e86562..37bfcca3c 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 207d220fd..1e307e011 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index c028eda54..92b181aa7 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -17,9 +17,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' feature: - core: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index e4b0c9adf..eebbfe58c 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: @@ -59,8 +57,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index b4d275583..01ad34ef7 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 67d5c5d73..00eaf282c 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -82,33 +82,6 @@ # Used by the release job staging-profile-id: a67b22fc3663f -- project: - name: netconf-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: netconf - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/ - rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'netconf' - project-name: 'netconf' - branch: 'stable/fluorine' - build-node: centos7-builder-2c-8g - mvn-settings: 'netconf-settings' - mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' - build-timeout: 90 - dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a67b22fc3663f - - project: name: netconf-sonar jobs: diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 2c8554c07..357a6e6fb 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -146,52 +146,3 @@ odl-ml2-port-binding: 'pseudo-agentdb-binding' openstack_system_image: '{openstack_queens_system_image}' openstack_system2_image: '{openstack_queens_system_image}' - -- project: - name: netvirt-csit-hwvtep-openstack-integration-fluorine - jobs: - - inttest-csit-hwvtep-openstack-custom - - project: 'netvirt' - stream: 'fluorine' - branch: 'stable/fluorine' - testplan: '{project}-{topology}-l2gw-openstack.txt' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,l2gw-plugin' - enable-openstack-compute-services: 'placement-client' - security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 - tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040 - os-cmb-cnt: 0 - os-ctl-cnt: 1 - os-cmp-cnt: 2 - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' - - topology: - - 1node: - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - functionality: - - upstream-stateful - - gate-stateful - - openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml index a68bffc94..cf6ea9a0a 100644 --- a/jjb/netvirt/netvirt-csit-multi-apex.yaml +++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml @@ -15,8 +15,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' testplan: '{project}-{topology}-openstack.txt' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index f64662b78..ed750dc49 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -13,9 +13,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' - disable-job: true testplan: '{project}-{topology}-openstack-upgrade.txt' odl-ml2-driver-version: 'v2' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 711594106..7d114f87e 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -254,90 +254,6 @@ openstack_system_image: '{openstack_queens_system_image}' openstack_system2_image: '{openstack_queens_system_image}' -- project: - name: netvirt-csit-openstack-integration-fluorine - jobs: - - inttest-csit-openstack-custom - - project: 'netvirt' - stream: 'fluorine' - branch: 'stable/fluorine' - testplan: '{project}-{topology}-openstack.txt' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,tempest' - enable-openstack-compute-services: 'placement-client' - security-group-mode: 'stateful' - odl_system_flavor: odl-highcpu-8 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 - tools_system_count: 0 - os-cmb-cnt: 0 - os-ctl-cnt: 1 - os-cmp-cnt: 2 - - topology: - - 1node: - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - robot-options: '-v FAIL_ON_EXCEPTIONS:True' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - functionality: - - upstream-stateful - - upstream-stateful-itm-direct-tunnels: - enable-itm-direct-tunnels: 'true' - - upstream-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - - gate-stateful - - gate-stateful-itm-direct-tunnels: - enable-itm-direct-tunnels: 'true' - - gate-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - - gate-minimal-cluster: - testplan: '{project}-{topology}-minimal-openstack.txt' - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - - gate-tdd-wip: - testplan: '{project}-{topology}-tdd-wip-openstack.txt' - schedule: '' - tools_system_count: 3 - enable-gre-type-driver: 'yes' - - tempest-stateful: - test-suites: 'openstack/tempest/tempest.robot' - testplan: '{project}-{topology}-openstack-tempest.txt' - schedule: '{schedule-daily}' - - tempest-stateful-snat-conntrack: - test-suites: 'openstack/tempest/tempest.robot' - testplan: '{project}-{topology}-openstack-tempest.txt' - odl-snat-mode: 'conntrack' - schedule: '{schedule-daily}' - - gate-tempest-stateful: - test-suites: 'openstack/tempest/tempest.robot' - testplan: '{project}-{topology}-openstack-tempest.txt' - - gate-tempest-stateful-snat-conntrack: - test-suites: 'openstack/tempest/tempest.robot' - testplan: '{project}-{topology}-openstack-tempest.txt' - odl-snat-mode: 'conntrack' - - openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' - - rocky: - openstack-branch: 'stable/rocky' - odl-ml2-branch: 'stable/rocky' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_rocky_system_image}' - openstack_system2_image: '{openstack_rocky_system_image}' - - project: name: netvirt-csit-sfc-openstack-integration jobs: @@ -384,9 +300,6 @@ - neon: branch: 'stable/neon' ovs-install: 'v2.9.2' - - fluorine: - branch: 'stable/fluorine' - ovs-install: 'v2.9.2' - project: name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration @@ -409,8 +322,6 @@ branch: 'master' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' topology: - 1node: diff --git a/jjb/netvirt/netvirt-job-reports.yaml b/jjb/netvirt/netvirt-job-reports.yaml index 3e1363ebc..97d4693b2 100644 --- a/jjb/netvirt/netvirt-job-reports.yaml +++ b/jjb/netvirt/netvirt-job-reports.yaml @@ -8,7 +8,7 @@ netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine + netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon report-logurl: 'https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1' report-numjobs: 100 report-path: '/tmp/jobreports' @@ -36,8 +36,8 @@ default: '{report-jobnames}' description: | Space separated list of job names to process. Example: - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine + netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon + netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon - string: name: LOG_URL default: '{report-logurl}' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index a17c4e983..f5bc6fe6e 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -17,9 +17,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 74f1d6068..55c7f9bfe 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -118,45 +118,6 @@ # Used by the release job staging-profile-id: a67da0ffbb1ba -- project: - name: netvirt-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - doc-dir: .tox/docs/tmp/html - project-pattern: netvirt - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/ - rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c - - gerrit-tox-verify - - odl-maven-jobs - - odl-maven-verify-jobs - - csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}' - block_on_csit: false - - stream: fluorine - branch: 'stable/fluorine' - - project: 'netvirt' - project-name: 'netvirt' - mvn-settings: 'netvirt-settings' - mvn-opts: '-Xmx2048m' - build-timeout: 90 - build-node: centos7-builder-8c-8g - dependencies: > - genius-merge-{stream}, - neutron-merge-{stream}, - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - ovsdb-merge-{stream}, - sfc-merge-{stream} - email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]' - - # Used by the release job - staging-profile-id: a67da0ffbb1ba - - project: name: netvirt-sonar jobs: diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index a0fde10d8..e6837b011 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -16,9 +16,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index f2bb81ab3..e9547ccb8 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -64,28 +64,6 @@ # Used by the release job staging-profile-id: a67e1b40d7419 -- project: - name: neutron-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'neutron' - project-name: 'neutron' - build-timeout: 90 - branch: 'stable/fluorine' - mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' - email-upstream: '[neutron] [odlparent] [aaa]' - disable-job: true - - # Used by the release job - staging-profile-id: a67e1b40d7419 - - project: name: neutron-sonar jobs: diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index 3913444f1..2dbb20fbd 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -16,9 +16,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index 66343af5a..0ccc84561 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -17,8 +17,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' functionality: - 'upstream' diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index 28ced1e9d..f3d77f317 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -14,8 +14,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' feature: - current: diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index 5c389c616..4e2743d34 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -18,9 +18,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' - disable-job: true project: odltools project-name: odltools diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 4d873e6dc..1800cf6de 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a6880455efe67 -- project: - name: of-config-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'of-config' - project-name: 'of-config' - branch: 'stable/fluorine' - mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m' - dependencies: netconf-merge-{stream}' - email-upstream: '[of-config] [netconf]' - disable-job: true - - # Used by the release job - staging-profile-id: a6880455efe67 - - project: name: of-config-sonar jobs: diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 5778ff09f..4dbaa9ce2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -17,8 +17,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index ec0b0b2d6..31f189ce2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index a88b2c576..6e4981092 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 71e5d56f8..81a810814 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 7fdcac46e..b717e4e6e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 28b95d8b7..4f47b917d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index f7e1660a2..0b9f4d455 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -20,8 +20,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 4c2e1851b..6f8689db9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 25f57e3a4..d2f324fb0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index af1f5d803..e413c3a29 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -20,8 +20,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 3d9d8cd95..8694eae49 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index bb5e84fcb..accf402b5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index f4db3f269..3b99f4549 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 7def71e92..7da1a5c09 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -19,9 +19,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 3e487fd61..9b0dc30f8 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -109,39 +109,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - doc-dir: .tox/docs/tmp/html - project-pattern: openflowplugin - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/ - rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'openflowplugin' - project-name: 'openflowplugin' - branch: 'stable/fluorine' - build-node: centos7-builder-2c-8g - build-timeout: 90 - mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream} - email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' - - # Used by the release job - staging-profile-id: a68a76dc1b44c - - project: name: openflowplugin-sonar jobs: diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index dfb14422a..f7fe12edd 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -21,11 +21,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - fluorine: - branch: 'stable/fluorine' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' archive-artifacts: '**/*.tar.gz' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 0e96a5fa7..5cc90942a 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -25,11 +25,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - fluorine: - branch: 'stable/fluorine' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' project-name: 'opflex' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index e0a9b439d..75fa4a6a3 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 23380aa2f..4da2bcbd1 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -21,8 +21,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index a779b636a..1acc416fa 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -11,8 +11,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' project: 'ovsdb' archive-artifacts: '*.log' diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 0be8fbece..23cf86b4b 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -18,9 +18,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 0608f9cb3..7d16ab172 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -88,32 +88,6 @@ # Used by the release job staging-profile-id: a68b188166958 -- project: - name: ovsdb-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: ovsdb - rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/ - rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'ovsdb' - project-name: 'ovsdb' - branch: 'stable/fluorine' - build-node: centos7-builder-2c-8g - mvn-settings: 'ovsdb-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a68b188166958 - - project: name: ovsdb-view views: diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 1c573655d..13a0d1b5b 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a68bf26e208d4 -- project: - name: p4plugin-fluorine - jobs: - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'p4plugin' - project-name: 'p4plugin' - branch: 'stable/fluorine' - mvn-settings: 'p4plugin-settings' - mvn-opts: '-Xmx1024m' - dependencies: '' - email-upstream: '[p4plugin]' - - # Used by the release job - staging-profile-id: a68bf26e208d4 - - project: name: p4plugin-sonar jobs: diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh index 86f126cca..24aed852e 100644 --- a/jjb/packaging/build-rpm-snap.sh +++ b/jjb/packaging/build-rpm-snap.sh @@ -15,9 +15,7 @@ $PYTHON -m pip install --upgrade pip $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt" # Convert stream to numeric ODL major version -if [ "$STREAM" == "fluorine" ]; then - VERSION_MAJOR=9 -elif [ "$STREAM" == "neon" ]; then +if [ "$STREAM" == "neon" ]; then VERSION_MAJOR=10 elif [ "$STREAM" == "sodium" ]; then VERSION_MAJOR=11 diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 5409186c8..304cf03d6 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -28,7 +28,6 @@ stream: - neon - - fluorine - sodium distro: @@ -220,20 +219,6 @@ build-timeout: '{build-timeout}' builders: - # Test Fluorine SR2 release tarball - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.9.2/karaf-0.9.2.tar.gz' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - - # Test Fluorine SR3 release tarball - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.9.3/karaf-0.9.3.tar.gz' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - # Test Neon SR2 ('Managed Release Common Distro') release tarball - inject: # yamllint disable-line rule:line-length @@ -301,58 +286,6 @@ build-timeout: '{build-timeout}' builders: - # Test Fluorine ('Managed Release Common Distro') release tarball - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/opendaylight/0.9.0/opendaylight-0.9.0.tar.gz' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - - # Test Fluorine SR1 release tarball - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.9.1/karaf-0.9.1.tar.gz' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - - # Test Fluorine SR2 release tarball - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.9.2/karaf-0.9.2.tar.gz' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - - # Test Fluorine SR3 release tarball - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.9.3/karaf-0.9.3.tar.gz' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - - # Test Fluorine pre-release autorelease tarball - # NB: This will need to be updated as old builds expire - # NB: Commented out to reduce maintenance - # - inject: - # yamllint disable-line rule:line-length - # properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2621/org/opendaylight/integration/karaf/0.9.2/karaf-0.9.2.tar.gz' - # - shell: !include-raw-escape: build-rpm.sh - # - install-test-uninstall-rpm - - # Test Fluorine multipatch zip (no parallel tarball available) - # NB: This will need to be updated as old builds expire - # NB: Commented out to reduce maintenance - # - inject: - # yamllint disable-line rule:line-length - # properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.2-SNAPSHOT/karaf-0.9.2-20181222.162905-8.zip' - # - shell: !include-raw-escape: build-rpm.sh - # - install-test-uninstall-rpm - - # Test latest Fluorine snapshot - - inject: - properties-content: 'STREAM=fluorine' - - shell: !include-raw: build-rpm-snap.sh - - install-test-uninstall-rpm - # Test Neon SR2 release tarball - inject: # yamllint disable-line rule:line-length diff --git a/jjb/packaging/test-rpm-docker.sh b/jjb/packaging/test-rpm-docker.sh index 764377e5e..c0c1701c1 100644 --- a/jjb/packaging/test-rpm-docker.sh +++ b/jjb/packaging/test-rpm-docker.sh @@ -26,7 +26,7 @@ sudo docker exec "$docker_id" /bin/bash $scripts_path/start-odl.sh sudo docker exec "$docker_id" /bin/bash $scripts_path/test-ports-nofeature.sh # Don't install test feature and check REST for Oxygen, ODLPARENT-139 breaks it -if [ "$STREAM" == "fluorine" ] || [ "$STREAM" == "neon" ] || [ "$STREAM" == "sodium" ]; then +if [ "$STREAM" == "neon" ] || [ "$STREAM" == "sodium" ]; then sudo docker exec "$docker_id" /usr/bin/expect $scripts_path/test-karaf-oxygensafe.expect else sudo docker exec "$docker_id" /usr/bin/expect $scripts_path/test-karaf.expect diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 36cad0dce..eda597675 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -22,8 +22,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 3abb57ba7..346735aac 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a68ca4a24655c -- project: - name: packetcable-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'packetcable' - project-name: 'packetcable' - branch: 'stable/fluorine' - mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m' - dependencies: '' - email-upstream: '[packetcable]' - disable-job: true - - # Used by the release job - staging-profile-id: a68ca4a24655c - - project: name: packetcable-sonar jobs: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 6055c53a4..2a592fdb8 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -16,9 +16,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index f6d161650..9cc030279 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -97,38 +97,6 @@ # Used by the release job staging-profile-id: 12cc4ba8bf01ba -- project: - name: serviceutils-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: serviceutils - rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/ - rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4 - - odl-maven-jobs - - odl-maven-verify-jobs - - branch: 'stable/fluorine' - stream: fluorine - - project: 'serviceutils' - project-name: 'serviceutils' - build-node: centos7-builder-2c-2g - mvn-settings: 'serviceutils-settings' - mvn-opts: '-Xmx1024m' - build-timeout: 90 - dependencies: > - controller-merge-{stream}, - yangtools-merge-{stream}, - odlparent-merge-{stream}, - infrautils-merge-{stream} - email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]' - - # Used by the release job - staging-profile-id: 12cc4ba8bf01ba - - project: name: serviceutils-sonar jobs: diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 38a86ec25..3ffe3401d 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index f73bb5941..ecb62e765 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -20,8 +20,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - all: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 67d5e2bc6..f412d8026 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -19,9 +19,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' feature: - basic: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index e54988256..6de3b14db 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -11,8 +11,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' project: 'sfc' project-name: 'sfc' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 11de8f039..2a662843e 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -79,32 +79,6 @@ # Used by the release job staging-profile-id: a68eb361ca48a -- project: - name: sfc-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: sfc - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/ - rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'sfc' - project-name: 'sfc' - branch: 'stable/fluorine' - mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' - build-timeout: 120 - dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' - email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: a68eb361ca48a - - project: name: sfc-sonar jobs: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 3668a510a..8dd08a140 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -54,24 +54,6 @@ # Used by the release job staging-profile-id: a68fb236b93a6 -- project: - name: snmp-fluorine - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'snmp' - project-name: 'snmp' - branch: 'stable/fluorine' - mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[snmp] [odlparent]' - - # Used by the release job - staging-profile-id: a68fb236b93a6 - - project: name: snmp-sonar jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 6d18b120f..03ed8de98 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -69,29 +69,6 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 -- project: - name: snmp4sdn-fluorine - jobs: - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: snmp4sdn - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-snmp4sdn/75649/ - rtd-token: 55ee5e520f96e1fa691b277b2919e8d62cb0b71f - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'snmp4sdn' - project-name: 'snmp4sdn' - branch: 'stable/fluorine' - mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a69034a4b6ef5 - - project: name: snmp4sdn-sonar jobs: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 183652c44..ffbdeb981 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -23,12 +23,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' install: - all: diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index f48f71d65..ee524c73f 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -23,12 +23,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' install: - all: diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index b24015594..09790fbad 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -23,12 +23,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' install: - all: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 4fff57357..372822e6e 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -23,12 +23,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' install: - all: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 118f67219..1fdebcbbd 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -23,12 +23,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' install: - all: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 5b1b9447c..f9bebfe31 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -23,12 +23,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' install: - all: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 1a4556fdf..b701b947b 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -23,12 +23,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' install: - all: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 04cfa1a4e..0316e6ed1 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -84,29 +84,6 @@ # Used by the release job staging-profile-id: a6909c75719b7 -- project: - name: sxp-fluorine - jobs: - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: sxp - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/ - rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'sxp' - project-name: 'sxp' - branch: 'stable/fluorine' - mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a6909c75719b7 - - project: name: sxp-sonar jobs: diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index 0077d0b24..8c04f1cf4 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -75,26 +75,6 @@ # Used by the release job staging-profile-id: 8ed9c52266504 -- project: - name: telemetry-fluorine - jobs: - - 'odl-maven-jobs' - - odl-maven-verify-jobs - - '{project-name}-integration-{stream}' - - stream: fluorine - project: 'telemetry' - project-name: 'telemetry' - branch: 'stable/fluorine' - mvn-settings: 'telemetry-settings' - mvn-opts: '-Xmx1024m' - dependencies: '' - email-upstream: '[telemetry]' - archive-artifacts: '' - - # Used by the release job - staging-profile-id: 8ed9c52266504 - - project: name: telemetry-sonar jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 252e8e9b6..a2bfdcbe3 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -78,29 +78,6 @@ # Used by the release job staging-profile-id: a6927323fa3d4 -- project: - name: transportpce-fluorine - jobs: - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: transportpce - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/ - rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd - - odl-maven-jobs - - odl-maven-verify-jobs - - project: 'transportpce' - project-name: 'transportpce' - stream: fluorine - branch: 'stable/fluorine' - mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a6927323fa3d4 - - project: name: transportpce-sonar jobs: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 97cc0b01e..606978e65 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -24,12 +24,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' install: - only: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 90b26a97c..5b9a83d86 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -24,12 +24,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index c24db7d84..f8687f553 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -24,12 +24,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' install: - all: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 8bb55ce28..49f447c74 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -24,12 +24,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' - - fluorine: - branch: 'stable/fluorine' - trigger-jobs: '{project}-merge-{stream}' - karaf-version: 'odl' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' install: - all: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 6e6ae6e0d..34e5d03cc 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -69,29 +69,6 @@ # Used by the release job staging-profile-id: a69373036303c -- project: - name: tsdr-fluorine - jobs: - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: tsdr - rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/ - rtd-token: 96c97641155132afcc5900bafc68af3364d91c99 - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'tsdr' - project-name: 'tsdr' - branch: 'stable/fluorine' - mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m' - dependencies: '' - email-upstream: '[tsdr]' - - # Used by the release job - staging-profile-id: a69373036303c - - project: name: tsdr-sonar jobs: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 662dd6aaf..f6ffac677 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -72,31 +72,6 @@ # Used by the release job staging-profile-id: a695d0a0b8d51 -- project: - name: unimgr-fluorine - jobs: - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: unimgr - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/ - rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31 - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'unimgr' - project-name: 'unimgr' - branch: 'stable/fluorine' - mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'ovsdb-merge-{stream}' - email-upstream: '[unimgr] [ovsdb]' - build-node: centos7-builder-4c-16g - disable-job: true - - # Used by the release job - staging-profile-id: a695d0a0b8d51 - - project: name: unimgr-sonar jobs: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index cc4c0dbf7..1404bee7c 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -20,10 +20,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' - # yamllint disable-line rule:line-length - repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' install: - all: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index df3113b5e..e06973762 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a697b633b3ffe -- project: - name: usc-fluorine - jobs: - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: fluorine - project: 'usc' - project-name: 'usc' - branch: 'stable/fluorine' - mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m' - dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' - email-upstream: '[usc] [controller] [yangtools] [odlparent]' - - # Used by the release job - staging-profile-id: a697b633b3ffe - - project: name: usc-sonar jobs: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index d36c44ace..0d6c51d54 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -19,8 +19,6 @@ branch: 'stable/sodium' - neon: branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' install: - only: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 223073a17..01bb964f3 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -17,9 +17,6 @@ - neon: branch: 'stable/neon' os-branch: 'queens' - - fluorine: - branch: 'stable/fluorine' - os-branch: 'queens' jdk: 'openjdk8' -- 2.36.6