Remove all fluorine jobs 24/85124/1
authorAnil Belur <abelur@linuxfoundation.org>
Tue, 15 Oct 2019 15:10:15 +0000 (20:40 +0530)
committerAnil Belur <abelur@linuxfoundation.org>
Tue, 15 Oct 2019 15:11:24 +0000 (20:41 +0530)
Fluorine is EOL since Sodium released. Remove all
fluorine jobs from repo.

Change-Id: I9964e7e2cdc50c33d33860e691a1725038e6f31b
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
154 files changed:
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/ansible/ansible.yaml
jjb/archetypes/archetypes.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/validate-autorelease-fluorine.yaml [deleted file]
jjb/autorelease/view-autorelease-fluorine.yaml [deleted file]
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/coe/coe.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml
jjb/controller/controller.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/detnet/detnet.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/csit-jobs-fluorine.lst [deleted file]
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/integration-test-jobs.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal-patch-test.yaml
jjb/mdsal/mdsal.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-apex.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-job-reports.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron-patch-test.yaml
jjb/neutron/neutron.yaml
jjb/odlparent/odlparent-patch-test.yaml
jjb/odltools/odltools-csit.yaml
jjb/odltools/odltools-patch-test.yaml
jjb/odltools/odltools.yaml
jjb/of-config/of-config.yaml
jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/build-rpm-snap.sh
jjb/packaging/packaging.yaml
jjb/packaging/test-rpm-docker.sh
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/serviceutils/serviceutils-patch-test.yaml
jjb/serviceutils/serviceutils.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-binding-origin.yaml
jjb/sxp/sxp-csit-cluster-binding.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/telemetry/telemetry.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml

index 5fad26068819c7040bd7e92aa6b948492c0aec7e..867b909cf6c4cdd4ce3358d95281ba12ff9a15de 100644 (file)
@@ -15,8 +15,6 @@
     stream:
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index c7d58fdb70674c1b703dfdba8c6cb95550b5eb89..83024fb9facc1a51ab98b0f2d9f90363ad5d42ed 100644 (file)
@@ -17,9 +17,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     feature:
       - authn:
index b4e2f177e9738fe983569699bc8b210212a9aa73..4a270e2214ef88011b036100b2fb6b634991b445 100644 (file)
     # 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:
index 09ff941e2396462cf1bd1e90bde178111b9c6489..5814a47b915afc9e85677814eb3d7d7768158a35 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 620416c4ecccb842947172369c057549393075c1..509485f5d6cead8c5d32de6a99f9f89071af2adf 100644 (file)
     # 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:
index c39aba02bdd27f09eabb89492b7f42e60b341dd2..5f832011771957c573f60c48f947662d8b81978b 100644 (file)
@@ -15,8 +15,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     project: ansible
     project-name: ansible
index a7a5f983746726194a441965ef1794b10e599a9f..8ae2754822711ce2ee107d0fd6535ba5a27a08fc 100644 (file)
     # 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:
index f891270b9359b82978179ac9199772f066e761c2..46c75fbb1e23ca3a1377fec16f34a4ceec5add2d 100644 (file)
@@ -20,9 +20,6 @@
       - neon:
           branch: 'stable/neon'
           integration-test: neon
-      - fluorine:
-          branch: 'stable/fluorine'
-          integration-test: fluorine
 
     project: releng/autorelease
     project-name: autorelease
index 863a9749fc42526609a24f9664a93991b4884d28..d31b686c57cc45a26536ab8c93b418fcd7fb6957 100644 (file)
@@ -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 (file)
index 7a399b5..0000000
+++ /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 (file)
index fa5d908..0000000
+++ /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
index 109e823f790e76d43aa837b78657c4c0cab56d12..023597fe1bf75a3e507b99a9d9d87a3a1b642bd9 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index fa77fa9b024563e64dacff56bb64f0f705097e32..37bcaa2404f89b6344601a0943ddc97974f5672c 100644 (file)
@@ -20,8 +20,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index f2b17e3de0db796aadf967be77a815f528a87621..3c287c3baf7808681689d81f09ce1fde81c22a9a 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 76fb276cfc18b3b26ede95fef2eb3b860cab95fa..40c415b604d9488734323909b2f71c6e4288e368 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 4da67667d4e6bc3dd7a2181adf134b244d5d3457..c2426f069d36be7c9391c51cded8d0d7a27fa673 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index aa4b2072faf938a6ec54db7fa23175da489a1098..56cfa04d70685467f51c5382a432787e6432b3df 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index d98e8d871bc998fcb951e07476aca8e2b07dafe0..3e3f54d91ff13ddfb372a68d84ea8e9ba497cf72 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index d7cd48b41ab972140f0be201baf4c7da3f8f9b8b..15d1e0cc263d49d564639c6f098ff3837307f961 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     feature:
       - bgp:
index f3c1f3019692dbeac9dc4805e0f6173ebafd2b4a..09234977e68fa72ef6e085cc8225f510d4c82c50 100644 (file)
     # 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:
index a74244dd76ae4a89167d38e12c33ce09ae226c3b..00d53d026d0f3e29e772d15eddb5c937ef569de8 100644 (file)
           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:
index 9a01f109052637cb4eb6c7279530f182300819b6..b9bbc1d08b93878413ea91cd68f02a9c4de01979 100644 (file)
     # 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:
index d80a240af8a9f21fbfc4cb1fe950fdba6784e66b..fc4d5ded50ad75491684d87f6f91af1d72ea3690 100644 (file)
     # 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:
index f5064107fc4e91c62725563a0958c5a71808d05a..c1744ecf1b90052b8ac73dc7c8078ed04268153f 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 3d11e1bb54dc6a5fe3fb9e13e721a42e59a745e5..42381f72ccba667edde1ba5bbd297db09c2b3af6 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 33ac88f185a11c46e2723aebbbc9fa5c8faeecf0..0d3e99feb7cd63d899bb2823051d7c9e2a7db561 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 0007997c33f0de50a9f27bb003c211dd26a865f2..8a9eadeeb1e142f1fdaf062a6c037cf1b3de2b39 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 2e39dc6db477c17a82051d9f6cb3cf24f1ca921f..6945d229525ac78408488b46a1fb4d797a2aa4a6 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 8889f04a7c22cb8afd1bc3d8b99441373736dd45..6d10daff1f3af1ce4a01d099773c9e0ec7c49aad 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 6e7f726b5547c698b0bb890252cccde3940f5938..14b16a89ed5b5d6e8ae4c20a7663731c46d9ce90 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index d301d1b42c01e098f3dff5c871d10ca7a657b269..ed057052f973eafa0dbdd4e53f9ca897e25a3aa9 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 27f0dc9d5e7e53d2f44a65ae3656be702a31c933..90968375479283666559a49b64c7ad22ccaf6512 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index b2d3db5ba2aa2ad2c5d67fdc980b413d37f455e8..2437f3aff6c7b0b8c250c1543c109b934632d956 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 6d9ea122cf96a45e6eeafc93898842000385f3c7..660f6d599d053ee2d240d3c4b3a04774e689ff6e 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 9cd25961570141c3ff3c3e379285b8a315cf82ba..995f6f9f40a75ca21f68123a4127fb24c3ad9cd3 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 418e620105835c0cb14c12cda4a114c7ea86f33d..898143288a09ec1e11bf297f5c3331787dc52868 100644 (file)
@@ -17,9 +17,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 3c8f7e492578733ebf211e5a6b85ead9fbfa3825..7815e672d9670194f5e696655632288932482d65 100644 (file)
     # 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:
index 4eaf840daefc7b9ffa642413c8c8c1a88578d6c8..e7c7948fe619c0bf0e680fabd30037fa52136d10 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index e291685ce962466971ec33f0d45e9c2185d9ae09..9ca289f08f20b50fff20a2569c09a5b4287692eb 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index f4edd79171811f1d52b661454ea6faf427b181bf..0d0fc2fe50719158879b5618afabc314770f2be8 100644 (file)
     # 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:
index 95bdfdce790c7e2f6cc21c983fd8710b691efd5f..f4b36978eb005326d498370a1566cc07f926b597 100644 (file)
@@ -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
 
     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,
         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
index eeabc40ac399b95fa57830a5af5a07cd99832a75..d4723919bcc595b8aa16077a3fb8f982c3bbce86 100644 (file)
     # 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:
index a539ccae776adc24a14b2560c6130db5ffa71591..162d6d93fb1f5252732f71b07667c1286e5a1d45 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 60c373bb02a9a0b0a1131ad8a19fe0c84abffdc9..485570b5cdd4f5e68eef1269df8369fbd4407834 100644 (file)
     # 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:
index 9471e1df649dc5d2a85c970b74ac9422e888210c..b61f6b06fec39ab55df61a8ff943d98c81ab8882 100644 (file)
@@ -12,8 +12,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     project: docs
     project-name: docs
index 8daeff5ced7c1d1f7a4093d7d7238490200a1a1b..ac90a6e0c7257f665cbe66c3549752fe00c22bdc 100644 (file)
@@ -23,8 +23,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
 
     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'
index d61f6ceef8b6475ce83bc6d497dffc36959e1b60..b1b96a8fbee71a16a39a3d10885d5fb6a94f86b1 100644 (file)
@@ -17,9 +17,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     feature:
       - netvirt:
index d8ccd698b46ed53ba534a60e2941f8122652d4c4..ae5e22a810559079b35fa1acf2fb00bfc54d112a 100644 (file)
     # 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:
index ef7bb3cf656f1ea9c675737a9d0f481bae4ecce1..b232113d634e46add318d7c1e48639bb88f20b26 100644 (file)
@@ -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:
index 55c545e4ce4b5795fb888948c52020b09bb88599..fbd23e6ada465e053ac4902a4b9a05952e3a790c 100644 (file)
@@ -20,8 +20,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 571420bfd183f970b15d2b208f1c53890a1f3526..e32e60d69199e2c0f230fdfcabe5930e372cb462 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 769973843348dc80e9f67955cefdda60178ed367..78462910d7431321f9254f70769e5392eacd2e5b 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 9236a74b0aee577e2a8634a2016c868dac3df79e..af0df03a35d8ba88cd66281c0e99d54d4db07ca2 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 5eac9bdaf18e2c6175ca79e853caa02b07dd3045..dcec8895c6499a32dfc2c0f6c2b97c9c4b241e3e 100644 (file)
     # 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:
index f60f1431e2638dff697a13e930e75aaf1787d1c0..b6956c8215dba7662565386191a96e600e0030fa 100644 (file)
     # 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:
index e8d8df1357147ece780b1bf06ade91411213bbde..d39b795f27d6bcd28c50040964bc82c3af6d8099 100644 (file)
@@ -16,9 +16,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 8232415aed79801d5cfaa6220bef1398b26243e2..d3859f04b104158b914618e6faa8ab76c138184c 100644 (file)
     # 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 (file)
index 89aafe9..0000000
+++ /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,
index bf52804f8249ad43bafa5a4625ab539b5bb6ce8f..440077193640fb611efd183c38c53335f31d444d 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 356241a779ba2b3dd06f98dbfe8e4c20ad9c3630..5b56cd4e4864288881b1f11db21db313d2e4826c 100644 (file)
               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
               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
           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
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
 - project:
     name: distribution-sonar
index 4a87cf4f3f354c3b1cecb35131ecf40acdf7bcf8..d3b8cab99d90521beac2bc4fd0fda0429e8e81ef 100644 (file)
               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
               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
           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'
       - 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'
index 072e29560ae88e8111591ac55673f0d80b382e23..2626339c57b8bed76bf9d2303afd147211c8633f 100644 (file)
@@ -22,8 +22,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 874cd397e228aed23eb14ad549ace2a8dd3a7506..fd1d902c874f9c3971f080a031dd7f6b7e43497b 100644 (file)
     # 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:
index 634a48581a17a54ee55d1c97427820b8bfd744c4..c98b2e4ecf5e5b12570af64ccc813e8e612f04dc 100644 (file)
@@ -20,8 +20,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index fc8cd0325499a89dd11f8e2dfd6090178d8162f6..6263547c9d5f116f5fa31d7a5dde1016e0f9bbea 100644 (file)
@@ -20,8 +20,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 094d4fa242c8bb6fc22825896be222098df34721..c80044e17a20af08fd56603b1a515ddf28db5430 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 655a2e3105b044cef19af5201dd6d0beb74299f8..a2d0fa8fb90bcae9b0af0376a28022a000697816 100644 (file)
@@ -19,8 +19,6 @@
           os-branch: 'queens'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     feature:
       - all:
index 173a66549def88f79ee90720937149587cfc72c9..1253ed55267ef70ea8fef7c168df4570d5048210 100644 (file)
     # 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:
index 0ac20cb59926f62c5003147cf0bb4e7138d47e43..a73f0402ae08f7dc8474e48d724e0480ceacbc1d 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index ad612a7d3a69ed1554f5c29e186d314fb576e7b3..a5f30b4760fd1c64d43228079bd731cbc6a6d934 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 54e443ac1e1a4996845dc87a33a940a4726be097..47b95303a6b6912346ecd72f409a24249cab494e 100644 (file)
     # 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:
index 9f34180d8eac38a8a97b823b217bab3684bf7ebe..44da788e2c1fe5ed804cbca8f4c3de0dbd2dde3b 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 3b49e2316bcb279b738b627df51a29659d36344a..87a3cbd2bc24cd6d0ca9fd4cc6946e4d11d013d3 100644 (file)
@@ -17,9 +17,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index b588b68930810605450dfaf11b218c5bb2850836..0d524a42352d057f1962d03d7d253df10a6b3655 100644 (file)
     # 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:
index dc92bd0751cfabd92e2ef1af7d67c450d9c2b462..b6c6f3b58ba74f2140af77e80f9681ede5d0eba1 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 6de9899b7c9d0f749dcd3b2df07c7b34c8092736..7489622dd5e6476638c85eaeb3d9ea1e7df3957a 100644 (file)
     # 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:
index a59ae159304955b963beb6bd895b1191b73b54c8..64c987eb91b06e95caa9534acb29c247a33cfdc5 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 843e86562d1016eab4847650a9df8eec7490849c..37bfcca3cf832dc04b88f3c87c3de68da1eb3276 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 207d220fde78b1baa22b69688acc433ead1ad70c..1e307e011318d31d0c532170e8ed721d11a09a5f 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index c028eda54ca3d2a48ae14c3974a8e0b184d9fa38..92b181aa7e2c50a55022850d63d93a791f214af9 100644 (file)
@@ -17,9 +17,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     feature:
       - core:
index e4b0c9adf84ce6f5d25b7fc356a968473292048c..eebbfe58c9cb943d6ee4acfce77ac86e3485b4a7 100644 (file)
@@ -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:
index b4d2755839e0d265bd84f74347b6bf55e12e5a4b..01ad34ef7e6a57b5bc61678cbd08c32e6459704c 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 67d5c5d732229923b67d175aad130ad1c5ad95b3..00eaf282c64d2a25b1731549c911c591b1cfcd32 100644 (file)
     # 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:
index 2c8554c07b36411d05077b422d78f15c07b5d0fc..357a6e6fbeccc02a8c16d79355e9b1c591823dda 100644 (file)
           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}'
index a68bffc947b4fb1e6dc56f486adb816f8b005de5..cf6ea9a0ab6eba059f6b815402fdcd5bd158dc76 100644 (file)
@@ -15,8 +15,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     testplan: '{project}-{topology}-openstack.txt'
 
index f64662b7869fe886e89d630fce9fc5237eaaf337..ed750dc49902d1436e669bd7dfba08b37d255a82 100644 (file)
@@ -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'
index 7115941069d8db1c450fac6b8f0a36e14c05866a..7d114f87e1f0ab8ff5ee25e55618b5b40afc3042 100644 (file)
           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:
       - 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
           branch: 'master'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     topology:
       - 1node:
index 3e1363ebc3ae1f8b747f5c9396e1bf13ef6d1e58..97d4693b21abffd09bf2188d60253f8b96a55bbe 100644 (file)
@@ -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}'
index a17c4e9834a245bab2b01b07fd7599c1b398bc20..f5bc6fe6eec35d42e142a5d5ec3e47488a2e5895 100644 (file)
@@ -17,9 +17,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 74f1d606889cee2750ed796156e83a6756ae118d..55c7f9bfebbe1102813ef3920f14235d15b17ab4 100644 (file)
     # 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:
index a0fde10d818a4cd8b941095620639f4471f948dd..e6837b0113500446228ba46caf0be249d2cf3eac 100644 (file)
@@ -16,9 +16,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index f2bb81ab3be28984351486e12d720857e0cc520e..e9547ccb85d1a2e613abe3aed8c837d77aa01a3f 100644 (file)
     # 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:
index 3913444f18f965f6ccc7e682c5382f05809b8bde..2dbb20fbd6e55347da0cc6ada4fcb2826a0fa151 100644 (file)
@@ -16,9 +16,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 66343af5abfed460da6597a891b900daecf0bf09..0ccc84561db0e8f37e864966d6564d08e1ebb4e4 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     functionality:
       - 'upstream'
index 28ced1e9d6a1d70dae8c42aa921c4ca6aed7f3b6..f3d77f3172b24ec5fa14542180e8f32b566ffcea 100644 (file)
@@ -14,8 +14,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     feature:
       - current:
index 5c389c616a47a44eeff626312c6c6d4b485f4f6b..4e2743d3447fbff7b2bcf0fbf19da8f854bcec90 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
-          disable-job: true
 
     project: odltools
     project-name: odltools
index 4d873e6dcb404828f3d02f2cc6ff41cebbf20308..1800cf6de51dc8e8d531b24dd68edd017f5c9c31 100644 (file)
     # 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:
index 5778ff09fa2e7d919d2cbb32cfb72f8210b11bff..4dbaa9ce21f7fd64ff9fa76e32bae470b4f93832 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index ec0b0b2d6349e4133ad807751e94c4460ba246b5..31f189ce2b9676a3a3af8d8ec4cb89f6b3088246 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index a88b2c576b7b735be17ef23f34ee68e14f959c41..6e4981092feb08281555ac785fc7f425316045c4 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 71e5d56f8f180a4baefcce5990e0e73490a50f3f..81a810814e05f96930ddd85391a5599ba5ce4d0c 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 7fdcac46ecd1e45bb5826db38d7c229285980c95..b717e4e6e73aceac565b031583dd58482c6b5a0f 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 28b95d8b7d0d81d3f999b79e03904e5205ec81c7..4f47b917d3f1e7e03abdaaa74d705ef5ec20b4ce 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index f7e1660a2c8f5ef7f6f43499eb7bb801e6399163..0b9f4d4557d713ab9d46b1711c0c9e584f84e60f 100644 (file)
@@ -20,8 +20,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 4c2e1851bf6b106a4da346cffd5545a40485c344..6f8689db906abfe33488edf425cead9d0c4e0640 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 25f57e3a48a4fe3b51f191a856134598e00f2828..d2f324fb0855316d456be343fd1a22ab4df4a43d 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index af1f5d8039823749c633dac57dce5716df766f7c..e413c3a290dcb4488554964c482a6bd7efa1dfab 100644 (file)
@@ -20,8 +20,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 3d9d8cd95b4f5e6073c4f7770c746096d39069ba..8694eae4963371bf65782c0ddb478fc9afd94523 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index bb5e84fcb0fe7b33d2d5102a197639dce2d7b54f..accf402b576b89889b904ccd8528c12eab8ab716 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index f4db3f2698babff092a5a4099e0f5c3cb81c2b16..3b99f45495c41532c4a9eaa4f751b72117d0758a 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 7def71e92ac8ba19ce43e977467faad4b242689b..7da1a5c0911e5642a8827d9ad85376ed601cd23a 100644 (file)
@@ -19,9 +19,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 3e487fd61b5c90b65dfb5e4b5522f0ff627c5718..9b0dc30f8e9057c14433720fc789da2f57479f6d 100644 (file)
     # 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:
index dfb14422a8e2381964eeac38c9da2023031d557c..f7fe12edd2ab1150b16b5d6e71c21802782c68ab 100644 (file)
           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'
index 0e96a5fa71e1aa44a3bf91b8e1828a866f3673d6..5cc90942a1b03814e7119bca2486fae01ec3640a 100644 (file)
           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'
index e0a9b439d835f143a2e312c3af193c0484271d97..75fa4a6a3f7e7d52e7c10e4e063bccbfd672b666 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 23380aa2fab671f7cda0602437d62416811045fc..4da2bcbd1e657b1c6a47f44993a4e6f47ff76896 100644 (file)
@@ -21,8 +21,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index a779b636a35526ba21f8b5b41c6e0bd420845b9e..1acc416fa2f0f078e595da5239efc8269f8da214 100644 (file)
@@ -11,8 +11,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
index 0be8fbece938833617fd45bb87ca7ef59e628b83..23cf86b4bd680b7015eb3ce3b9fe32814b884c1e 100644 (file)
@@ -18,9 +18,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index 0608f9cb3c42b1bbdc0427766346fc212ec0f932..7d16ab172a22fcd5160b1684533602c1241059bb 100644 (file)
     # 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:
index 1c573655d4d2944304de2863d490292611ddd924..13a0d1b5b59b4c1439dbf006576f443042a5f9ed 100644 (file)
     # 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:
index 86f126ccae1789be30757d79d1bfff83deabecb6..24aed852effdfd651efed8c5961e27c5f274c5e1 100644 (file)
@@ -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
index 5409186c87b09e8a518620aafe95215a1433be53..304cf03d6f3d40dc7142fe2aae208edd87b4d852 100644 (file)
@@ -28,7 +28,6 @@
 
     stream:
       - neon
-      - fluorine
       - sodium
 
     distro:
           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
           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
index 764377e5e25c656d27b2f7dec1bb98a6dc1fd5f7..c0c1701c1bb5daa614dfd3305cabfe16ede17f97 100644 (file)
@@ -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
index 36cad0dce0833ada0532b6b57ace7fa5925b91e3..eda5976753dc45f9723316189e584e8145055318 100644 (file)
@@ -22,8 +22,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 3abb57ba77c9e8db3dab0f099099a93fbc7592d7..346735aac584273bebb743a4d8cb0ea7bdf4a6f1 100644 (file)
     # 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:
index 6055c53a42f9a22e4257df40d874f9d4e8d6edd8..2a592fdb8ed975b15bb9b84bde66c73d3967483f 100644 (file)
@@ -16,9 +16,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'
 
index f6d1616508c060a7935deb2d830177d7c1d20121..9cc030279abc68abb82e577e8003acf5df851238 100644 (file)
     # 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:
index 38a86ec25178ef886d0db328b6ef3f84336a1adc..3ffe3401dcb1524d4ffec1e61a4bdb641555faa4 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index f73bb5941950c13d3b3647c8c864d604072fa305..ecb62e765f9f1403f4d86eb3816825a804ddd9c9 100644 (file)
@@ -20,8 +20,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - all:
index 67d5e2bc6e3ac3bbc98e9237d4448edea7da4a7b..f412d80269b6dee233bebdd7908ef18ac6e1784c 100644 (file)
@@ -19,9 +19,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     feature:
       - basic:
index e54988256e8ca95a2f51ae7ddfce9974803c4792..6de3b14dbb7051fdee1f006171696d9f0396897a 100644 (file)
@@ -11,8 +11,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     project: 'sfc'
     project-name: 'sfc'
index 11de8f039a74dc3a3962d97805dec1abff18fdd8..2a662843ef0666553b38200e309b0a4b421e4916 100644 (file)
     # 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:
index 3668a510a3b6c98bbfed0d982771ae641f93cedc..8dd08a140e360c7de03f25098fb6de9e811cfa4e 100644 (file)
     # 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:
index 6d18b120f8d4234a13bf17ea847a2b1f62583515..03ed8de9842939e05012ec253bdbc6a53be87540 100644 (file)
     # 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:
index 183652c4426a0a1aa6caf2ef16e7246c3770fa6d..ffbdeb981fbe5cef7a84a37b5ed5311c0a2ec716 100644 (file)
           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:
index f48f71d6576b7048903da827accc5a0b9f5197be..ee524c73f3e886d740fbafef713975d50bbed23f 100644 (file)
           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:
index b240155942d710c400610bef8e344c07312dcdc9..09790fbad2d52707e65bda66ca068ab721917d62 100644 (file)
           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:
index 4fff57357c810518fa497ad726aefa18ad699d86..372822e6ee68c9745805db09adc1b5ec187ff58e 100644 (file)
           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:
index 118f672191593fb5c401d60c9d5f8c2c5189df60..1fdebcbbd1dbb7c8f193d9d7b597d47b0cf8f653 100644 (file)
           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:
index 5b1b9447c3dd55b9db01e1d2da181f5fd4d329d4..f9bebfe318aaf92b496980224aec91dbf7014060 100644 (file)
           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:
index 1a4556fdf3b84ecf0fe2a1b8f9982092e2033311..b701b947b8518ab943fef414f74aa644a82bcdf1 100644 (file)
           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:
index 04cfa1a4e8afceb57fea7a152cb9b86c29aeac9f..0316e6ed156e4c54c0f4c35436a03af5dd50dc3b 100644 (file)
     # 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:
index 0077d0b24944f102aaf3365bab250aa025222e2e..8c04f1cf4789e7b40263bba70b1a494bb0e7eb54 100644 (file)
     # 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:
index 252e8e9b62867f88705dcc9e24e5c108bc2571e8..a2bfdcbe30af502f11939ddf083f48be458f4563 100644 (file)
     # 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:
index 97cc0b01efac4eb63d45645e5ed916efc968ca05..606978e654000ae9dce2284d06e815750dcc5ffe 100644 (file)
           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:
index 90b26a97c11de81ab7184366804c0a2a46a4bfda..5b9a83d8642a0045c6c7676861922687c8300238 100644 (file)
           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:
index c24db7d8447aafc0fe1e4ad74ba098f37ba953bf..f8687f553edd3d4da8d248a1e553f116426a5f2e 100644 (file)
           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:
index 8bb55ce28de6bbc8166a6da8ce9a47a974165d73..49f447c746398c035c8d8908a7ff461dc7ccc62d 100644 (file)
           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:
index 6e6ae6e0d65633d25d9371ae9ed008bc5ccde48c..34e5d03cc073763f8804e8020a72cb1093f53515 100644 (file)
     # 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:
index 662dd6aafb9a2bb726c76dece7ecefe310393ffb..f6ffac6774ebdd475af05d7d38b177b4aeb77bf8 100644 (file)
     # 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:
index cc4c0dbf7a429908ae1c95af3180ec52ed125b3a..1404bee7c9f81598b23489c3e4ff4546a1f5cc83 100644 (file)
           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:
index df3113b5e9d089521ecce7b055ee55efb4bb2e23..e069737627638e8aa98520c8219b7a940af513ab 100644 (file)
     # 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:
index d36c44acebd30e5a8b6903c41d028207ca60e6f6..0d6c51d541f69244e625dabb75c212c221ac4b84 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
     install:
       - only:
index 223073a17382f7e02e3296a474778dd8aecc8616..01bb964f3df95178dbb301ed281f8b83716f19df 100644 (file)
@@ -17,9 +17,6 @@
       - neon:
           branch: 'stable/neon'
           os-branch: 'queens'
-      - fluorine:
-          branch: 'stable/fluorine'
-          os-branch: 'queens'
 
     jdk: 'openjdk8'