Remove all Neon jobs 90/88690/3
authorAnil Belur <abelur@linuxfoundation.org>
Thu, 26 Mar 2020 02:32:51 +0000 (12:32 +1000)
committerJamo Luhrsen <jluhrsen@gmail.com>
Thu, 26 Mar 2020 18:11:43 +0000 (11:11 -0700)
Neon is EOL-ed with Magnesium being released.

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I7f32e9da2a2a4b602c9e3c5d0219625365dce1fa
Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
155 files changed:
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alt-datastores/alt-datastores.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-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/validate-autorelease-neon.yaml [deleted file]
jjb/autorelease/view-autorelease-neon.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/coretutorials/coretutorials.yaml [deleted file]
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.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/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/csit-jobs-neon.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/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-csit-basic.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 0d8d75ac2b62f49270842df570e7c6d8e2a2f80c..f4a417c623d60238f2de555082d94cd492bf7661 100644 (file)
@@ -21,9 +21,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          testplan: '{project}-{functionality}-neon.txt'
 
     install:
       - all:
index 5c254fb5cbf3601327b411ba9f0a48e2ba6ad935..ccb19764241335f2f6451f05341611dfd4d4b6e1 100644 (file)
@@ -15,8 +15,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
 
index b1a4f8192e063c5e512adea3599d582a2e67d158..ad1b3edc61cfe8255b666d2ce30f8d94134889d0 100644 (file)
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
-- project:
-    name: aaa-neon
-    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: neon
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/neon'
-    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 dc359c7563f9443cf2ec97e32c43ea075b16256f..cf2e9954af01dcd866a67bcd1777e1dcb734373c 100644 (file)
     # Used by the release job
     staging-profile-id: daa2b00117ed6
 
-- project:
-    name: alt-datastores-neon
-    jobs:
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: alt-datastores
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/
-          rtd-token: dc412b0cc43fba4098173878f970e76380ce0084
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'alt-datastores'
-    project-name: 'alt-datastores'
-    branch: 'stable/neon'
-    mvn-settings: 'alt-datastores-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]'
-    build-node: centos7-docker-2c-8g
-
-    # Used by the release job
-    staging-profile-id: daa2b00117ed6
-
 - project:
     name: alt-datastores-sonar
     jobs:
index f06a3f08c12e5caca94d5e58869cd22a914f8ae0..265dd0bb7d1c858b006c1cce344e9ebbaae240c2 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 15bbeb59f282684a80583e34756abccbd5b66f65..dd766f10ceacc690633a4a32649926987a66394f 100644 (file)
     # Used by the release job
     staging-profile-id: 931eabae9693c
 
-- project:
-    name: alto-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/neon'
-    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 e48200e20c5c9a2d10a7ec7c45c751ee4c03798a..780d2064ef392e31df5b92638fa1011fbc1608b6 100644 (file)
@@ -15,8 +15,6 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: ansible
     project-name: ansible
index 0cb92fb193e26ee7fe0b0155162d8a8fc8797a50..c5924cebe566f1ffb76ae1888af4b16efc69b1df 100644 (file)
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
-- project:
-    name: archetypes-neon
-    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: neon
-    project: 'archetypes'
-    project-name: 'archetypes'
-    branch: 'stable/neon'
-    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 bbad8f62c841cc0bf2543d6b773816b3ffbd741e..f15d67080271c65d2c404a1690a10d7f05a230e7 100644 (file)
       - sodium:
           branch: 'stable/sodium'
           integration-test: sodium
-      - neon:
-          branch: 'stable/neon'
-          integration-test: neon
-          cron: '@weekly'
 
     project: releng/autorelease
     project-name: autorelease
index 8667b2331a04f90a5896f31efe2bf4e8cc85f059..5d46c1a8bdc3f926f52e198250796bd72684c202 100644 (file)
           name: RELEASE
           description: |
               Release to generate release notes for.
-              Eg. Neon-SR1, Fluorine-SR2...
+              Eg. Sodium-SR1, Magnesium-SR2...
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
index 672a199dde07c98f2bf1979de33d3a857cf4a0e2..88efcc96acc46c783ef8df39d9e32aee188c1677 100644 (file)
@@ -17,5 +17,3 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
diff --git a/jjb/autorelease/validate-autorelease-neon.yaml b/jjb/autorelease/validate-autorelease-neon.yaml
deleted file mode 100644 (file)
index 3085dec..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
-- project:
-    name: autorelease-validate-neon
-    jobs:
-      - '{project-name}-validate-autorelease-{stream}'
-    stream: neon
-    branch: stable/neon
-    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
-      - 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-neon.yaml b/jjb/autorelease/view-autorelease-neon.yaml
deleted file mode 100644 (file)
index 207aef1..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
-- releng_view: &releng_autorelease_view_common_neon
-    name: releng-view-autorelease-neon
-    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-Neon
-    description: 'List of Neon Merge jobs for Autorelease'
-    job-name:
-      - 'aaa-merge-neon'
-      - 'bgpcep-merge-neon'
-      - 'controller-merge-neon'
-      - 'coe-merge-neon'
-      - 'daexim-merge-neon'
-      - 'genius-merge-neon'
-      - 'infrautils-merge-neon'
-      - 'integration/distribution-merge-neon'
-      - 'lispflowmapping-merge-neon'
-      - 'netconf-merge-neon'
-      - 'netvirt-merge-neon'
-      - 'neutron-merge-neon'
-      - 'openflowplugin-merge-neon'
-      - 'ovsdb-merge-neon'
-      - 'serviceutils-merge-neon'
-      - 'sfc-merge-neon'
-    <<: *releng_autorelease_view_common_neon
index 234c1570bf778f6f9e41d2746a0f858b8f0db3fd..244f96fcb45e13b69cd6d73c4296dfa170ea5a6b 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 386d9fad497a36490908ecf8ed7e54540763ac13..ced3840dffc48d65d47c7cfdc39fd60d6184d93f 100644 (file)
@@ -21,8 +21,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 57cee509d6044c0674ce668f938fecf6f0fecb71..15d27ff9099aad19bb274bd84437bda3c9133127 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 856a654920126c14e1a2e0101f1f51652795de64..2a9cad380a28568b0ebb7d23b79a542aa6ab3d85 100644 (file)
@@ -23,8 +23,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index f9430de8448471a1c3daa56405bce278aeef1ba8..dd2cfa62c6a18d70b355f3d79e013bfdd9c798ef 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index bdee08fe2151a94dfbc2746c5cb210bb7a909ba5..6576c79a95473c28b52dfc3953f1e800be3307f7 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index e556ae51f494a88f4b8a5fbd257c2187ccb357e7..f452b88f97f09e74325324132b7b87354f2a8aa2 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 704397a30a9e888051eb268850078fafdd06db82..fd8753ba357b7b37a4720d7a8b0ccb14c10befd2 100644 (file)
@@ -17,8 +17,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     feature:
       - bgp:
index 23d8e956ee56400ffec687216b599a7afed94fcc..aaead5681486a2babe6156ba2e74c2b7a1c0f86b 100644 (file)
     # Used by the release job
     staging-profile-id: 9427a05049030
 
-- project:
-    name: bgpcep-neon
-    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: neon
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: 'stable/neon'
-    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 f705a3f18c908a94afd5e4c815379b7381d8e04f..6ed2d87b41e8f307550416eaaca7349242165df1 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
-    verify-stream: 'neon'
-    verify-branch: 'stable/neon'
+    verify-stream: 'sodium'
+    verify-branch: 'stable/sodium'
     verify-karaf-version: 'karaf4'
 
     install:
index 0d7c677fe3673cd96622e1dbbb5c59b454afec1c..e8d9f2ae7ced4bb50b8efe3cf9ee6ee5aa743a0b 100644 (file)
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
-- project:
-    name: bier-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/neon'
-    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 fe0191b8dcca85a2e0ced0dab96ddb6489ff18fb..ff1208e9a0076aeaa3bbdf31ae6ab4f995c037a3 100644 (file)
     # Used by the release job
     staging-profile-id: 96c0be46aac33
 
-- project:
-    name: coe-neon
-    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: neon
-    branch: 'stable/neon'
-    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 8eb807845536187355b3012c93c47eea2141e377..c95eb3a53ee118a55cbc07cc6bbf885f780d408f 100644 (file)
@@ -19,8 +19,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 928a39ef8c66d1de368cabecb5dbbc5bf61e9d27..957775a9ef248b220451b98f82de1091f7e29ab9 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 65aa0a6af6390f6792dcf3333f4dd6cbe579f4c7..4d2aba33e2592e1789f4afdc934e5b6151a0146b 100644 (file)
@@ -23,8 +23,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 90352ea8f7972c58e95da1e75827ef81aac5eec3..726bc999533c0b20149bbbe8b34d980a0faa3dea 100644 (file)
@@ -23,8 +23,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 0018a8248e0ca52886731f4996ed9b81d3e44202..e3470f6d4992a358be1d5b673d87f41001faacfb 100644 (file)
@@ -23,8 +23,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index e8cb03bb8efd7b3e55eb04636184ae5dead1c971..8478e19fa6c827b8124637b629b0a00cb62a8e9b 100644 (file)
@@ -23,8 +23,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 1ae96bd6c4fa67424157dae5c34c69dd596ff4fb..233f2b711479c349f6fc5189dc5c6d37695f85f2 100644 (file)
@@ -23,8 +23,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index adabb39190a38b71bcda3a53357581a7135b9dfa..45d12958a2d7073ae3994013c4a327a61ec0ebe1 100644 (file)
@@ -23,8 +23,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 06cc97256e4981a4ce26e89e2758bd4956f160ed..ddf01235fa317bf937c97d3e13c45fd56fb32fe3 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index c482bbeb4dbb9fb689a904519d0e0e61238a7b57..0fe0026ff47e361123b26c1fcfaf431d1e910ccd 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 1c69e68698ef98f53d7d0eb3f4a57734605f0d1c..ed408a31985d214ce86e0b8d04994c22fc89d6d2 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 9f2b57789ce57028164375a60cdf71b71834b07f..6078eed663788d6b81d715e7faa9d7ebf4517655 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index d654040050d2553b37739686569a14eab97df110..8e44441bed1e2c9b85a8f5ff25d5b2ced135b172 100644 (file)
@@ -15,8 +15,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
     jdk: 'openjdk8'
index 7d46ad5c6191d9e85a43d9d71a6a55851940699d..0fd152377d6cbf4ce16df0d6da266fc847083232 100644 (file)
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
-- project:
-    name: controller-neon
-    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: neon
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/neon'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96c1c9177efdd
-
 - project:
     name: controller-sonar
     jobs:
diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
deleted file mode 100644 (file)
index 68de249..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- project:
-    name: coretutorials-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'master'
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    build-timeout: 120
-
-    # Used by the release job
-    staging-profile-id: 96cd299563ec6
-
-- project:
-    name: coretutorials-sonar
-    jobs:
-      - gerrit-maven-sonar
-
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: master
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m'
-    build-timeout: 120
-
-- project:
-    name: coretutorials-view
-    views:
-      - project-view
-    project-name: coretutorials
index d5919816096e6c03ce135ea918b5c023c53659ce..1bab2dc6151228a85883a1f5b2471ccdd7033ced 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 67d500fdc66294bbc2c70bf5c70c05920f6d5bb9..81e3800d708aa24ee12cc8c01e2e9d5d4bf35bde 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 556ac2a7ee9dccf1097f99a7fbcd919ea363cb59..4a7bafd256f8be3723bef97e06d687819025d57d 100644 (file)
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-neon
-    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: neon
-    branch: 'stable/neon'
-    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 245692b0d06f1d1634306e87e1b607245f76fff9..43cdb93cf0d27ad074735acda527cbd138d83a15 100644 (file)
@@ -99,9 +99,9 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/neon
+    verify-branch: stable/sodium
     # Value for ODL_STREAM
-    verify-stream: neon
+    verify-stream: sodium
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
     csit-sanity-list-sodium: >
         openflowplugin-csit-1node-sanity-only-sodium,
         distribution-sanity-sodium
-    csit-sanity-list-neon: >
-        openflowplugin-csit-1node-sanity-only-neon,
-        distribution-sanity-neon
     csit-weekly-list-aluminium: >
         controller-csit-1node-notifications-longevity-only-aluminium,
         controller-csit-3node-drb-partnheal-longevity-only-aluminium,
         distribution-deploy-sodium,
         distribution-offline-sodium,
         openflowplugin-csit-1node-longevity-only-sodium
-    csit-weekly-list-neon: >
-        controller-csit-1node-notifications-longevity-only-neon,
-        controller-csit-3node-drb-partnheal-longevity-only-neon,
-        controller-csit-3node-drb-precedence-longevity-only-neon,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-neon,
-        bgpcep-csit-3node-bgpclustering-longevity-only-neon,
-        distribution-deploy-neon,
-        distribution-offline-neon,
-        openflowplugin-csit-1node-longevity-only-neon
index b6e9295c874e65bb42250ef146be202a7129e518..e4e898f7e31057c92f1bcde9d27915a0ca864ab2 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 982601c8123114a67161e6f1032f254ff41f5a2c..3f93d2cdf4432d05f6037bc9835f0323bf10ce86 100644 (file)
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
-- project:
-    name: dluxapps-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: neon
-    branch: 'stable/neon'
-    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 ce5be8ea2ed983af7e46ee1b677cfd7e39da7734..857850373d2e274542b6ca30a4f3b8ab2021d77a 100644 (file)
@@ -12,8 +12,6 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: docs
     project-name: docs
index 84ea8aa68a2fe6f6bf6f29ef63b634aa8743abc1..43ff1abc3c2091bf456b261965b9e6c69aa7ff7d 100644 (file)
@@ -24,8 +24,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index a9fb132c6dbea340daceef06b2ac088018ce519a..22019011bc9b410bbc18a276a28ab966f0e6bbfb 100644 (file)
@@ -15,8 +15,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
 
index a58e783e411b3a4ae28a310da5b4b6ab49fefdf9..55cb3062485386cab632b7cb71fe83a5b3adcfa3 100644 (file)
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
-- project:
-    name: genius-neon
-    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
-
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
-    stream: neon
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/neon'
-    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 05d84a60555ce094c224d1d055ad10c77096fbbf..5145980d964e4866db772ba86b8c93a7bb9f5ef1 100644 (file)
@@ -28,9 +28,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
       - queens:
index c52fa0a45b2d83edebfe8ffd4364d8afb74e9966..65bf712809e7bb1c4a9940f37d3a5b32f8eb7cb1 100644 (file)
@@ -21,8 +21,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 5e6f5a28e47319ce2dd140d0a9a53bdd9ebb0d91..eb92ba31ce804e8058b5043b5b5cdee4bf73e8ab 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index d65c801dcf52da4464505078db4fb300104e8939..3371ae968ccd10593b99638e5406712118df4f1f 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 3e78d054726afb4251f0d3cde1c356fcb817da3f..c0fcd16314c58d93205abdad239898b86b23154d 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index eb3cb602b9dd6039b70a1bee1f40a52b39e991b9..d44e686f977b12ffe714bda904be914a32d61c87 100644 (file)
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
-- project:
-    name: groupbasedpolicy-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/neon'
-    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 ad61a69ae428cb56710f4a343c67efb1d7088374..c185bf1267979e7de466dd7551aba3f6d4ca8b5d 100644 (file)
@@ -15,8 +15,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
     jdk: 'openjdk8'
index 0e5f0119f8ba0c9ae773f1d2ad3df82486b05476..6c1079c3972160be57ffb869f9b1748f8d41f496 100644 (file)
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
-- project:
-    name: infrautils-neon
-    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: neon
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/neon'
-    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-neon.lst b/jjb/integration/csit-jobs-neon.lst
deleted file mode 100644 (file)
index 0289ff5..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-aaa-csit-1node-authn-all-neon,
-bgpcep-csit-1node-bgp-ingest-all-neon,
-bgpcep-csit-1node-bgp-ingest-mixed-all-neon,
-bgpcep-csit-1node-throughpcep-all-neon,
-bgpcep-csit-1node-userfeatures-all-neon,
-bgpcep-csit-3node-bgpclustering-all-neon,
-bgpcep-csit-3node-bgpclustering-ha-only-neon,
-controller-csit-1node-akka1-all-neon,
-controller-csit-1node-benchmark-all-neon,
-controller-csit-1node-rest-cars-perf-all-neon,
-controller-csit-3node-benchmark-all-neon,
-controller-csit-3node-clustering-ask-all-neon,
-controller-csit-3node-clustering-tell-all-neon,
-controller-csit-3node-rest-clust-cars-perf-ask-only-neon,
-controller-csit-3node-rest-clust-cars-perf-tell-only-neon,
-daexim-csit-1node-basic-only-neon,
-daexim-csit-3node-clustering-basic-only-neon,
-distribution-csit-1node-userfeatures-all-neon,
-distribution-csit-managed-neon,
-genius-csit-1node-upstream-only-neon,
-genius-csit-3node-upstream-only-neon,
-lispflowmapping-csit-1node-msmr-all-neon,
-lispflowmapping-csit-1node-performance-only-neon,
-lispflowmapping-csit-3node-msmr-all-neon,
-mdsal-csit-1node-bindingv1-only-neon,
-netconf-csit-1node-callhome-only-neon,
-netconf-csit-1node-scale-max-devices-only-neon,
-netconf-csit-1node-scale-only-neon,
-netconf-csit-1node-userfeatures-all-neon,
-netconf-csit-1node-userfeatures-rfc8040-all-neon,
-netconf-csit-3node-clustering-only-neon,
-netconf-csit-3node-clustering-scale-only-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-neon,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-neon,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-neon,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-neon,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-neon,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
-odltools-csit-1node-upstream-all-neon,
-openflowplugin-csit-1node-bundle-based-reconciliation-all-neon,
-openflowplugin-csit-1node-cbench-only-neon,
-openflowplugin-csit-1node-flow-services-all-neon,
-openflowplugin-csit-1node-perf-bulkomatic-only-neon,
-openflowplugin-csit-1node-perf-stats-collection-only-neon,
-openflowplugin-csit-1node-scale-link-only-neon,
-openflowplugin-csit-1node-scale-only-neon,
-openflowplugin-csit-1node-scale-switch-only-neon,
-openflowplugin-csit-3node-clustering-bulkomatic-only-neon,
-openflowplugin-csit-3node-clustering-only-neon,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-neon,
-ovsdb-csit-1node-upstream-southbound-all-neon,
-ovsdb-csit-3node-upstream-clustering-only-neon,
-sfc-csit-3node-docker-full-deploy-all-neon,
-sfc-csit-3node-rest-basic-all-neon,
-yangtools-csit-1node-system-only-neon,
index 35c33656abc21ebfa566db6811e558adfec42271..e90c66301ef18f1b9c397b2139e41f38a0f540a7 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 772ba0750bc1301e466e7bb0a21d78c6080cc4bc..ed0ef380cc1ae38baeea7f50afba36f49f201068 100644 (file)
               odl-transportpce,
               odl-transportpce-api,
               odl-transportpce-ordmodels
-      - neon:
-          branch: 'stable/neon'
-          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
 
 - project:
     name: distribution-managed
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
-          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},
-              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}
-      - neon:
-          branch: 'stable/neon'
-          karaf-version: odl
-          dependencies: >
-              distribution-merge-managed-{stream},
-              transportpce-merge-{stream}
 
 - project:
     name: distribution-release
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
 - project:
     name: distribution-sonar
index 0b06e561b67045253fa98b03478a9777ea738b70..ec2d9bd124c7950c591557c25758efc1d073feca 100644 (file)
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
               bgpcep integration/distribution
 
-      - neon:
-          branch: 'stable/neon'
-          mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-neon.lst
-          build-order: >
-              odlparent yangtools mdsal infrautils 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-sodium.lst
           csit-weekly-list: '{csit-weekly-list-sodium}'
-      - neon:
-          branch: 'stable/neon'
-          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-neon.lst
-          csit-weekly-list: '{csit-weekly-list-neon}'
 
 - project:
     name: integration-sanity
           branch: 'stable/sodium'
           karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-sodium}'
-      - neon:
-          branch: 'stable/neon'
-          karaf-version: odl
-          csit-sanity-list: '{csit-sanity-list-neon}'
 
 - job-template:
     name: 'integration-merge-dashboard'
     views:
       - project-view
     project-name: integration
-
-- view:
-    name: csit-stable-ne
-    description: 'List of stable integration jobs for managed projects'
-    job-name:
-      - aaa-csit-1node-authn-all-neon
-      - bgpcep-csit-1node-throughpcep-all-neon
-      - controller-csit-1node-akka1-all-neon
-      - controller-csit-1node-benchmark-all-neon
-      - controller-csit-1node-notifications-longevity-only-neon
-      - controller-csit-1node-rest-cars-perf-all-neon
-      - controller-csit-3node-benchmark-all-neon
-      - controller-csit-3node-drb-precedence-longevity-only-neon
-      - controller-csit-3node-rest-clust-cars-perf-ask-only-neon
-      - controller-csit-3node-rest-clust-cars-perf-tell-only-neon
-      - daexim-csit-1node-basic-only-neon
-      - daexim-csit-3node-clustering-basic-only-neon
-      - distribution-csit-1node-userfeatures-all-neon
-      - genius-csit-1node-upstream-only-neon
-      - genius-csit-3node-upstream-only-neon
-      - lispflowmapping-csit-1node-msmr-all-neon
-      - netconf-csit-1node-callhome-only-neon
-      - netconf-csit-1node-userfeatures-all-neon
-      - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
-      - openflowplugin-csit-1node-flow-services-all-neon
-      - openflowplugin-csit-1node-longevity-only-neon
-      - openflowplugin-csit-1node-perf-bulkomatic-only-neon
-      - openflowplugin-csit-1node-perf-stats-collection-only-neon
-      - openflowplugin-csit-1node-sanity-only-neon
-      - openflowplugin-csit-1node-scale-link-only-neon
-      - openflowplugin-csit-1node-scale-only-neon
-      - openflowplugin-csit-1node-scale-switch-only-neon
-      - openflowplugin-csit-3node-clustering-bulkomatic-only-neon
-      - openflowplugin-csit-3node-clustering-only-neon
-      - ovsdb-csit-3node-upstream-clustering-only-neon
-    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
index 8ee71ddeebd55195d29cc4c8be0f30323ff1b85f..a29ce98353cb961553713e43b0ccabeb8e0282a0 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 7e12df9693c4aec39ce1b10dc2bec3dee65977e6..354db8a4bde0745a0c49c539ef5bc76c13801fa6 100644 (file)
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-neon
-    jobs:
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: jsonrpc
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
-          rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: neon
-    branch: 'stable/neon'
-    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 db2687d8ea0bf94d1e26591421fc1182c5b08612..a2ccbb1052752237f8cc052415e440e5b0499a22 100644 (file)
@@ -21,8 +21,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index c83124089d5c9ae509e5e6cd77b6eb88c651844c..a35111d361e1c54238514d74e081117d8f109f0c 100644 (file)
@@ -21,8 +21,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index a4bf5a4dd03e7ee0459b491aecc3fec569f4cefc..23ab9c4c2ecbe2967619a90e2f3b3b072d3d4c5d 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 9b161f4aed07913c90466aa7dcf74dded61c4baa..268b6223c36e5d4e3e77b31a9f5ec5200ef0ce04 100644 (file)
@@ -18,8 +18,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
 
index 20dcd26ffa63a515668e01a31315a344fef142e4..ca8c2fd8bf733da45478c500ed6c48342b957533 100644 (file)
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
-- project:
-    name: l2switch-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/neon'
-    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 b2e8a24b6ce58e54ebd16433437b0e37ac71436f..3df1c63d25eefe9bdfdbb7670bc8353acc2d822a 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 5d8336bf0fe2d63d674f7cf66517572f3f5156dc..4a8c17c05e8aca4f26d7687119c90f6787418758 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index acab71681dc177133fdd3c8fecc857f164556f88..bf8b6d3ff95e743f7193ac12de98a597f25b61b1 100644 (file)
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-neon
-    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:
-          java-version:
-            - openjdk8
-
-    stream: neon
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/neon'
-    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 deb5c3deedf8dafd019c5030e79e7bd19ee995af..aeff6c4f8a6886c3059c36b5dc60d7607860d05d 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index dc1aa8f29d882519126f45ab041bb7fe3a538fd3..57fc332f2bf588c921c135f49f73baaf8b12c5aa 100644 (file)
@@ -15,8 +15,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
 
index d74980f50cb6badaf3f9523f31f6a9ac63e783ab..b68471a95a58eb7f6a1316cedb40d3360150908c 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 735706fd7b8dc2b27f0fe07aa9ed5c6865ded6c6..bb532eb00b7a0ab983a0c9be96e9046a7589e4d5 100644 (file)
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
-- project:
-    name: nemo-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/neon'
-    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 fa1e35b84db296f8fac96676cdde9162e02862ce..7c54ff96db71cf728366773d230d0309c84a232f 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 7879f357953cde2e6c151b85bb4f187e4ec49a08..f55ef62a4c626cd4e2001b5a7bd174095bfdcfdc 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index fea79f43c97f4b23f17bb40cf041fefee2e4cdb1..8b83aebe96e76d1b2a452a5a57542b5ac1a8285f 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index dc7215445e8db79e861f822ce512a257b3595c91..47b6c614d11be75563d548ed0ddce19dcee7e766 100644 (file)
@@ -15,8 +15,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
 
index ab6d8df6614d16b5c1b845fe74936de497ab41bb..3c3b69af81993da5750b0c22888bdf041706312a 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
           robot-options: '-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:10
                           -v MAX_DEVICE_COUNT:500 -v DEVICE_INCREMENT:25 -v TESTTOOL_BOOT_TIMEOUT:600s
                           -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*'
-      - neon:
-          branch: 'stable/neon'
-          robot-options: '-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:10
-                          -v MAX_DEVICE_COUNT:500 -v DEVICE_INCREMENT:25 -v TESTTOOL_BOOT_TIMEOUT:600s
-                          -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*'
 
     install:
       - only:
index 91ff60f949e1cb30ea413c7515c26f380193b06a..02f2ffbdc2f3552b0cfe4a10a99f8ce86cd1f244 100644 (file)
@@ -24,8 +24,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index d983fb0f9860dc7e4d9d91d2a959e9c33ecd0f12..89da37c727117c8d969345f46b1cebea6eb6ae95 100644 (file)
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
-- project:
-    name: netconf-neon
-    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: neon
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/neon'
-    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 4cee0b7fe60ac080c78e3997d1642ef52ab80ee4..80d00fb7a758bf357aeda917d491890a455676ef 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-neon
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: 'netvirt'
-    stream: 'neon'
-    branch: 'stable/neon'
-    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'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    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 5bc86374dbca5eb8f6f3603e1aec08e53f1677b4..075701fae38a34104364bd6946091ed2e5e28b20 100644 (file)
@@ -16,8 +16,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     testplan: '{project}-{topology}-openstack.txt'
 
index 4d829e8c30441fce2a4887634e5e6c54726d20b9..9dbe3bbccc9b84587316146bb0572d2cdd630446 100644 (file)
@@ -15,8 +15,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     testplan: '{project}-{topology}-openstack-upgrade.txt'
     odl-ml2-driver-version: 'v2'
index 15cd286154c046ee25a81c5c4ae41ef221dc8d71..3a39137567d124ef14e40983d667e5b7e149226e 100644 (file)
           openstack_system_image: '{openstack_rocky_system_image}'
           openstack_system2_image: '{openstack_rocky_system_image}'
 
-- project:
-    name: netvirt-csit-openstack-integration-neon
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    stream: 'neon'
-    branch: 'stable/neon'
-    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'
-          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'
-
-    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:
-      - stein:
-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
-
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     jobs:
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     topology:
       - 1node:
index 97d4693b21abffd09bf2188d60253f8b96a55bbe..5ea926796848160a1d295c513d16fd77797f7a2b 100644 (file)
@@ -5,10 +5,8 @@
     jobs:
       - netvirt-job-reports
     report-jobnames: >
-        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-neon
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium
     report-logurl: 'https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1'
     report-numjobs: 100
     report-path: '/tmp/jobreports'
@@ -36,8 +34,8 @@
           default: '{report-jobnames}'
           description: |
               Space separated list of job names to process. Example:
-              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-sodium
+              netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium
       - string:
           name: LOG_URL
           default: '{report-logurl}'
index 8e07d2b9c33dc3024e7cc06cf1d12b7283bcf374..b745f5f9fc8a6c394ff2387aaab6a7ae5b9fa828 100644 (file)
@@ -15,8 +15,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
 
index b0afc46ea8bff48baebb244d4a107fb0989eba7d..f3932e81b45642b8e049cac21dcccd68c8c50891 100644 (file)
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
-- project:
-    name: netvirt-neon
-    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: neon
-    branch: 'stable/neon'
-
-    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}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
-
-    # Used by the release job
-    staging-profile-id: a67da0ffbb1ba
-
 - project:
     name: netvirt-sonar
     jobs:
index 2c79fccf2cd4c592382842ae052d1326634d7ada..18180a94a277cc117fd7e882f22e85a0c4a152fc 100644 (file)
@@ -13,8 +13,6 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
 
index 4ac441c60778e216b6ab1699ccbdfe522c1329a6..dab038e5f3c876809644b65255c14a377a751f50 100644 (file)
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
-- project:
-    name: neutron-neon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 90
-    branch: 'stable/neon'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
 - project:
     name: neutron-sonar
     jobs:
index f03912f5d8bf6dc7c7012c13345713d4eaf94cbc..0141f7801b8f4500e37a15e3d69cb9f601d69a22 100644 (file)
@@ -13,8 +13,6 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
 
index c666759232498f6b4454b4887764ec4f76b65068..a84a280e6bf02f644604d9a87dfcbf27cd959f7a 100644 (file)
@@ -18,8 +18,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     functionality:
       - 'upstream'
index 67f5768d532afe8704b22b3e1d5251d12faceded..c3503a955b78a5638976c41c2c0961eced1e7bd3 100644 (file)
@@ -14,8 +14,6 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     feature:
       - current:
index f3d7cc3b55e632fe1339eabc88aa8b4e255ef305..ca1c3f774e5290e0dfdcdad4bfd4e8bcb10494ac 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: odltools
     project-name: odltools
index 2654fe70be9d1cab4d0f7940fa47d4be92328e93..a4abe3060d1b05ad00a64b2dbaf9a967400d4ed3 100644 (file)
     # Used by the release job
     staging-profile-id: a6880455efe67
 
-- project:
-    name: of-config-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/neon'
-    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 055b1c22d64857e13cf889788ea0d4086e85174c..3fca0825abe306784b053e12d4c044546be0e5c5 100644 (file)
@@ -18,8 +18,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index ab79f3271f1e2ada8f41e66c9dcdc3a606c251e9..be28da8d5be220a7957dc2dc66c110f1c14ff554 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index d7937aa346ad42b356011a0174f27612d86b9f9e..27007e3d08ebffbab57bbe6186a3a1e4fe519c20 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 61116a0fae8c9097d8c824fe30e3b57cff3d9e3e..ff8f0e119700c1115002150313aa37a907bf3169 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 8a2055228931f1daa931c4f693e23a498865f007..2e25311f6d1595cb139f10b4d646925f8446f1f8 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 1b18709454db5ac692f2cff5f5406493f7a94b85..b595352b1ce39b1d30f86e3136744833d76f24da 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 1d14c2bc5b3e525abea09de7986b733abb77fe0d..6fe25d0fddacfb80cfec2fe12d056ede3a66e185 100644 (file)
@@ -24,8 +24,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index cfc24608ed5ad0823913d25a2498bcd6077c08b7..c690cc11c48dc8dd796d5b94d99872f3695b7cfc 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index e5372c42262c6a9a2628500fae1d1ed90628b361..da81f9e39e3dce47720c203b50bd83186e927415 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index be78a664e75271a2526f2517208cf1a25a5fed43..4c3fdfdb28eac7f158094de5c9f55703873f5db9 100644 (file)
@@ -21,8 +21,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index cfc8f6429c344db23c2973d246f0572442bfeae9..2f15c4062d8ac93f4e5bb5c56744eee92dc960ff 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index c90e944a031b2b8bdb39a2a29ede0e545cf1cd84..54a71fbf33a087dc8b282358a28ed74e3d70b9aa 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 686c0c73c26c4cb7ed923f182a012c41b8aee3f8..74a5ef9fce4820250832f6d2fb75b72fd8c6eff6 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index 320c860d5a73b76144565c67bad411217d60ef68..d5d2ecac1368bd786104124657f61138c33c7de8 100644 (file)
@@ -17,8 +17,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
     jdk: 'openjdk8'
index 5d40fcf3643ea91a132e7df681682e61e20682bb..d6e473db8eec1b11358b5b816e1c18d0c4733c42 100644 (file)
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-neon
-    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: neon
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/neon'
-    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 53e085f0f834740e28c06dc8611ae16a222c1bc2..3d6531ae56ca555bb232f594faf3cc79f6aff8df 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - neon:
-          branch: 'stable/neon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
index 002d1ed6226af560457d325dded0f7c0f612ceff..b5cc790e3894c7078e379f03285148645efbab30 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - neon:
-          branch: 'stable/neon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     project-name: 'opflex'
index 40a4c9e8ea08c0d31d148783171d506df9ba8b68..111d1fb10bd1308b454ffb28e39ad426870f78f1 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index a9cbe5b1763f1071d5000ec9e4440b66b0548d03..9e4848f6789eb6652d85f4c9bc06095a692aad80 100644 (file)
@@ -22,8 +22,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index e8245a6d9958a237837c46238643e00348885adf..dc40a19352bad0033f4bde0c7e65f277903354e9 100644 (file)
@@ -12,8 +12,6 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
index 9663ee6e567263d26cf5c7342706c70ec4351e74..c52b34d364d52530c64e728aa6b694bfadbeed8b 100644 (file)
@@ -16,8 +16,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
     jdk: 'openjdk8'
index af71e7880234f1d15c0b6d4acb67212e752dfa9a..139dcc56ed5dd6e98113a13166a68babe330fee3 100644 (file)
     # Used by the release job
     staging-profile-id: a68b188166958
 
-- project:
-    name: ovsdb-neon
-    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
-
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
-    stream: neon
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/neon'
-    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 87732e3daa98a67f93907e446bf982bb64e64776..1d5d28b650b8cca345f550c51e843a5ff6839616 100644 (file)
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
-- project:
-    name: p4plugin-neon
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'p4plugin'
-    project-name: 'p4plugin'
-    branch: 'stable/neon'
-    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 24aed852effdfd651efed8c5961e27c5f274c5e1..402bc882b89bc892938c8429999bf5e9a9de08ac 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" == "neon" ]; then
-  VERSION_MAJOR=10
-elif [ "$STREAM" == "sodium" ]; then
+if [ "$STREAM" == "sodium" ]; then
   VERSION_MAJOR=11
 elif [ "$STREAM" == "magnesium" ]; then
   VERSION_MAJOR=12
index 304cf03d6f3d40dc7142fe2aae208edd87b4d852..17b19f6ca3396f7d781e815f70b445a74ae5eb71 100644 (file)
@@ -27,7 +27,6 @@
     project: 'integration/packaging'
 
     stream:
-      - neon
       - sodium
 
     distro:
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Neon SR2 ('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.10.2/opendaylight-0.10.2.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
       # Test Sodium ('Managed Release Common Distro') release tarball
       - inject:
           # yamllint disable-line rule:line-length
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test latest Neon snapshot
-      - inject:
-          properties-content: 'STREAM=neon'
-      - shell: !include-raw: build-rpm-snap.sh
-      - install-test-uninstall-rpm
-
       # Test latest Sodium snapshot
       - inject:
           properties-content: 'STREAM=sodium'
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Neon 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.10.2/karaf-0.10.2.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
       # Test Sodium release tarball
       - inject:
           # yamllint disable-line rule:line-length
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Neon 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-2620/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.g'
-      # - shell: !include-raw-escape: build-rpm.sh
-      # - install-test-uninstall-rpm
-
-      # Test Neon 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.10.0-SNAPSHOT/karaf-0.10.0-20190103.173010-50.zip'
-      # - shell: !include-raw-escape: build-rpm.sh
-      # - install-test-uninstall-rpm
-
-      # Test latest Neon snapshot
-      - inject:
-          properties-content: 'STREAM=neon'
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
index c0c1701c1bb5daa614dfd3305cabfe16ede17f97..11b94e5dd43637dce342daeedf881a25ba414c85 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" == "neon" ] || [ "$STREAM" == "sodium" ]; then
+if [ "$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 d1355abd337569405f7f34b841faf4a73e26c4eb..dd794b7fdddc6876e20d67eb9e9e23856080e915 100644 (file)
@@ -23,8 +23,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 0997797ae6fd5232ff1a50626d66f7c3253b14af..4508aec638deb701f26af4bcfe350ca2279b4382 100644 (file)
     # Used by the release job
     staging-profile-id: a68ca4a24655c
 
-- project:
-    name: packetcable-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/neon'
-    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 00bd91e7ca4830c7fbca59e4ecc61f154f124c96..2397c85dfe2ba9cf89b1c6a7c1100d9506fafa0a 100644 (file)
@@ -13,8 +13,6 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
     jdk: 'openjdk8'
index c726ad13d1d32aac28c80182dfa5977af71a5fec..2a87a1f7684873cb07285c6785f13267a776e53d 100644 (file)
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
-- project:
-    name: serviceutils-neon
-    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/neon'
-    stream: neon
-
-    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 4cfabd8a55fade838dadb21e0b757f3e889aab50..5bbfbdcba30c204d1692200853be404e910cb94f 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 6298d7fd0b3b19c7bccd1dc4a68eab8564809f39..80d389143b674c00bd9b8409e2c05de99a4aa40d 100644 (file)
@@ -21,8 +21,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index e3734df41f0eece4b95f8574ab2adeb88ac73d70..42f334eb608a9ec77d76ab76b0e2cbffbaa7b1ff 100644 (file)
@@ -17,8 +17,6 @@
           java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
 
index a4f2bcc1c2a53b5d18019db67f7ebdb4cc2fbb6d..bd0daa5a1763c823605cfdf5aca8c459363bc14c 100644 (file)
@@ -11,8 +11,6 @@
           branch: 'stable/magnesium'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     project: 'sfc'
     project-name: 'sfc'
index c46aca90d66b53fbe2b40ab04bb231eee1a37fbd..ed7f35edeefece9870cef50e0e9e4515a1cf96e6 100644 (file)
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
-- project:
-    name: sfc-neon
-    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: neon
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/neon'
-    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 14c91faf199a0294740beb44395405f1b8ffa921..cbca6396b75fbb1b9e31ca4cced975ac41888150 100644 (file)
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
-- project:
-    name: snmp-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/neon'
-    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 568bb9ba774d6299ece7cfb4d2b1d672ebccec65..358f7ead75e8c15070a472a3a967ea7aac777d79 100644 (file)
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
-- project:
-    name: snmp4sdn-neon
-    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: neon
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/neon'
-    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 e5a3f7d63cfcf542722c4ca912291df18e9458cc..28b1270e3797d6638c57b1c12ae7b649dcccaa60 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index 93dcaa0db1f624a5df4e9244938ba779d93f6132..d6c9a4ff3204087d93b84fbe10f379f0a60eab41 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index 4ab1a47e48c58ad6575d503c3f9829170fb47803..52d70be1913fc2c0b7aca19e091b0e6d6e038845 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index a15cf06fb90010efafa8336ed1373a5bae545252..7fc430817878b15e3df0d9f61126bc4f25a01af9 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index cdbb10396245e83b364b3c5ba4fec4623be77005..a83f648eef70fcea5bb1cce8378cd2223a22939d 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index 1ad7ab22c0a2e024d26ad88077ddb9539957d9d4..4af044b963a1af4c5143eae5e371a2390ac8e72e 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index 1e74c4093097aed1f1af3abe351d01662e674564..443585b0c686b8b0d37229331c7de6f51404c36d 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
 
     install:
       - all:
index 14b655fc7f80fdc466fb9b2452cdb0cc4f39f8cd..a19648c5216ad8b65cb15d1b43870a7364b03d46 100644 (file)
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
-- project:
-    name: sxp-neon
-    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
-
-    java-version:
-      - openjdk8
-
-    stream: neon
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/neon'
-
-    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 0ac33f1ef83afe3b19384d63549999b53c3a20c7..af637e1d68781bbe34a3314c922df75d6e6f7cfd 100644 (file)
@@ -21,8 +21,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index 7fd08fdf3420ce9c1c28050059c161b33367696c..e52de623fdfb95591ceb7cbe2e0723f87cfff373 100644 (file)
     # Used by the release job
     staging-profile-id: 8ed9c52266504
 
-- project:
-    name: telemetry-neon
-    jobs:
-      - 'odl-maven-jobs'
-      - odl-maven-verify-jobs
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: telemetry
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
-          rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
-
-    stream: neon
-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'stable/neon'
-    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 8bb59f306fce53ae66b098351f9589261c53fe08..762559292b35eca85f8a0c9c6201d3d9145ca8c1 100644 (file)
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-neon
-    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
-      - gerrit-tox-verify:
-          build-timeout: 120
-          build-node: centos7-builder-8c-8g
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: 'transportpce'
-    project-name: 'transportpce'
-    stream: neon
-    branch: 'stable/neon'
-    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 a260f5fdd9e83de1c14415f23e5e8c2ef5e9c128..c1df5fbcdcf3076a5529e2c6e82d0204fbb66643 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          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 c3c784012bca6308527e4f390d1df1be9b503294..6e4de655e9b3eb0759b3db0456cb38e22a16dbeb 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          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 b12efaa39a5343221398c3f9f93c10af4ccb650c..d7b38c30b96f9cb7ceab6c3056b46956333c18d1 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          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 ebd5dda6241572e579bc6d4508423a7d073d956f..a58b1ba6b9e9351f1392f2d95bcdd9d630cb42bb 100644 (file)
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          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 88b16cdd7e9e575137d73edd4d1ec9ea7b067244..d822df341a6451b641f3c01dadbf0d16d0cea451 100644 (file)
     # Used by the release job
     staging-profile-id: a69373036303c
 
-- project:
-    name: tsdr-neon
-    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: neon
-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/neon'
-    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 5ff0630b2947739a512ac5094f25835296a104b3..d597f70f66ed74fa85b7438c5f2f673b76deb14f 100644 (file)
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
-- project:
-    name: unimgr-neon
-    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: neon
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/neon'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: a695d0a0b8d51
-
 - project:
     name: unimgr-sonar
     jobs:
index 98b528163583a2cc329cfea7aea47cac78e4832a..2f2b42e46b2ac54fa667b50d431da323b869b825 100644 (file)
@@ -21,8 +21,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - all:
index eddcf409ed9d706095f99f9290e306164228a8bf..0f12b8a2eaaeba898fc7da919bc3d63655fec00e 100644 (file)
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
-- project:
-    name: usc-neon
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/neon'
-    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 7fd5210fb0b966943bf7e3f6af8e6ecb2304db7a..202c028d83d43c75ec3a45de6e58458c9dca6660 100644 (file)
@@ -20,8 +20,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     install:
       - only:
index ddad34fddf45f921504282c7be3d041099b6a18e..a9808ef6901e7805079571bb72d4ad36d35a176f 100644 (file)
@@ -15,8 +15,6 @@
           jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     os-branch: 'queens'
     jdk: 'openjdk8'