From 74d14c7b7904922061e1dafe7482438521aae6f7 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 26 Mar 2020 12:32:51 +1000 Subject: [PATCH] Remove all Neon jobs Neon is EOL-ed with Magnesium being released. Signed-off-by: Anil Belur Change-Id: I7f32e9da2a2a4b602c9e3c5d0219625365dce1fa Signed-off-by: Jamo Luhrsen --- jjb/aaa/aaa-csit-authn.yaml | 3 - jjb/aaa/aaa-patch-test.yaml | 2 - jjb/aaa/aaa.yaml | 24 ------ jjb/alt-datastores/alt-datastores.yaml | 24 ------ jjb/alto/alto-csit-setup.yaml | 2 - jjb/alto/alto.yaml | 20 ----- jjb/ansible/ansible.yaml | 2 - jjb/archetypes/archetypes.yaml | 23 ------ jjb/autorelease/autorelease-projects.yaml | 4 - jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 - .../validate-autorelease-neon.yaml | 41 ---------- jjb/autorelease/view-autorelease-neon.yaml | 41 ---------- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 2 - .../bgpcep-csit-bgpclustering-longevity.yaml | 2 - jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 2 - jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 2 - jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 2 - jjb/bgpcep/bgpcep-patch-test.yaml | 2 - jjb/bgpcep/bgpcep.yaml | 31 ------- jjb/bier/bier-csit-basic.yaml | 6 +- jjb/bier/bier.yaml | 21 ----- jjb/coe/coe.yaml | 25 ------ jjb/controller/controller-csit-akka1.yaml | 2 - .../controller-csit-clustering.yaml | 2 - .../controller-csit-cs-chasing-leader.yaml | 2 - .../controller-csit-cs-partnheal.yaml | 2 - ...ontroller-csit-ddb-expl-lead-movement.yaml | 2 - .../controller-csit-dnb-noloss.yaml | 2 - .../controller-csit-drb-partnheal.yaml | 2 - .../controller-csit-drb-precedence.yaml | 2 - .../controller-csit-dsbenchmark-cluster.yaml | 2 - .../controller-csit-dsbenchmark.yaml | 2 - .../controller-csit-rest-cars-perf.yaml | 2 - .../controller-csit-rest-clust-cars-perf.yaml | 2 - jjb/controller/controller-patch-test.yaml | 2 - jjb/controller/controller.yaml | 28 ------- jjb/coretutorials/coretutorials.yaml | 37 --------- jjb/daexim/daexim-csit-basic.yaml | 2 - jjb/daexim/daexim-csit-clustering-basic.yaml | 2 - jjb/daexim/daexim.yaml | 24 ------ jjb/defaults.yaml | 16 +--- jjb/dluxapps/dluxapps-csit-yangman.yaml | 2 - jjb/dluxapps/dluxapps.yaml | 20 ----- jjb/docs/docs-rtd.yaml | 2 - jjb/genius/genius-csit-genius.yaml | 2 - jjb/genius/genius-patch-test.yaml | 2 - jjb/genius/genius.yaml | 35 -------- ...groupbasedpolicy-csit-1node-openstack.yaml | 3 - .../groupbasedpolicy-csit-3node.yaml | 2 - .../groupbasedpolicy-csit-6node.yaml | 2 - .../groupbasedpolicy-csit-clustering.yaml | 2 - .../groupbasedpolicy-csit-sxp.yaml | 2 - jjb/groupbasedpolicy/groupbasedpolicy.yaml | 27 ------- jjb/infrautils/infrautils-patch-test.yaml | 2 - jjb/infrautils/infrautils.yaml | 26 ------ jjb/integration/csit-jobs-neon.lst | 68 ---------------- .../distribution-csit-userfeatures.yaml | 2 - .../distribution/distribution-jobs.yaml | 36 --------- jjb/integration/integration-test-jobs.yaml | 75 ----------------- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 2 - jjb/jsonrpc/jsonrpc.yaml | 23 ------ .../l2switch-csit-host-scalability-daily.yaml | 2 - jjb/l2switch/l2switch-csit-scalability.yaml | 2 - jjb/l2switch/l2switch-csit-switch.yaml | 2 - jjb/l2switch/l2switch-patch-test.yaml | 2 - jjb/l2switch/l2switch.yaml | 24 ------ .../lispflowmapping-csit-msmr.yaml | 2 - .../lispflowmapping-csit-performance.yaml | 2 - jjb/lispflowmapping/lispflowmapping.yaml | 33 -------- jjb/mdsal/mdsal-csit-bindingv1.yaml | 2 - jjb/mdsal/mdsal-patch-test.yaml | 2 - jjb/nemo/nemo-csit-engine.yaml | 2 - jjb/nemo/nemo.yaml | 19 ----- jjb/netconf/netconf-clustering-scale.yaml | 2 - jjb/netconf/netconf-clustering.yaml | 2 - jjb/netconf/netconf-csit-callhome.yaml | 2 - jjb/netconf/netconf-patch-test.yaml | 2 - jjb/netconf/netconf-scale.yaml | 7 -- jjb/netconf/netconf-userfeatures.yaml | 2 - jjb/netconf/netconf.yaml | 27 ------- .../netvirt-csit-hwvtep-openstack.yaml | 49 ------------ jjb/netvirt/netvirt-csit-multi-apex.yaml | 2 - .../netvirt-csit-multi-openstack-upgrade.yaml | 2 - jjb/netvirt/netvirt-csit-multi-openstack.yaml | 80 ------------------- jjb/netvirt/netvirt-job-reports.yaml | 10 +-- jjb/netvirt/netvirt-patch-test.yaml | 2 - jjb/netvirt/netvirt.yaml | 38 --------- jjb/neutron/neutron-patch-test.yaml | 2 - jjb/neutron/neutron.yaml | 21 ----- jjb/odlparent/odlparent-patch-test.yaml | 2 - jjb/odltools/odltools-csit.yaml | 2 - jjb/odltools/odltools-patch-test.yaml | 2 - jjb/odltools/odltools.yaml | 2 - jjb/of-config/of-config.yaml | 19 ----- ...ugin-csit-bundle-based-reconciliation.yaml | 2 - .../openflowplugin-csit-cbench.yaml | 2 - ...flowplugin-csit-clustering-bulkomatic.yaml | 2 - ...lugin-csit-clustering-perf-bulkomatic.yaml | 2 - .../openflowplugin-csit-clustering.yaml | 2 - .../openflowplugin-csit-flow-services.yaml | 2 - .../openflowplugin-csit-longevity.yaml | 2 - .../openflowplugin-csit-perf-bulkomatic.yaml | 2 - ...flowplugin-csit-perf-stats-collection.yaml | 2 - .../openflowplugin-csit-sanity.yaml | 2 - .../openflowplugin-csit-scale-link.yaml | 2 - .../openflowplugin-csit-scale-switch.yaml | 2 - .../openflowplugin-csit-scale.yaml | 2 - .../openflowplugin-patch-test.yaml | 2 - jjb/openflowplugin/openflowplugin.yaml | 33 -------- jjb/opflex/opflex-custom.yaml | 5 -- jjb/opflex/opflex.yaml | 5 -- jjb/ovsdb/ovsdb-csit-clustering.yaml | 2 - jjb/ovsdb/ovsdb-csit-southbound.yaml | 2 - jjb/ovsdb/ovsdb-full-integration.yaml | 2 - jjb/ovsdb/ovsdb-patch-test.yaml | 2 - jjb/ovsdb/ovsdb.yaml | 29 ------- jjb/p4plugin/p4plugin.yaml | 19 ----- jjb/packaging/build-rpm-snap.sh | 4 +- jjb/packaging/packaging.yaml | 42 ---------- jjb/packaging/test-rpm-docker.sh | 2 +- jjb/packetcable/packetcable-csit-pcmm.yaml | 2 - jjb/packetcable/packetcable.yaml | 19 ----- jjb/serviceutils/serviceutils-patch-test.yaml | 2 - jjb/serviceutils/serviceutils.yaml | 32 -------- jjb/sfc/sfc-csit-full-deploy.yaml | 2 - jjb/sfc/sfc-csit-rest-basic.yaml | 2 - jjb/sfc/sfc-patch-test.yaml | 2 - jjb/sfc/sfc-python.yaml | 2 - jjb/sfc/sfc.yaml | 26 ------ jjb/snmp/snmp.yaml | 18 ----- jjb/snmp4sdn/snmp4sdn.yaml | 23 ------ jjb/sxp/sxp-csit-basic.yaml | 6 -- jjb/sxp/sxp-csit-binding-origin.yaml | 6 -- jjb/sxp/sxp-csit-cluster-binding.yaml | 6 -- jjb/sxp/sxp-csit-clustering.yaml | 6 -- jjb/sxp/sxp-csit-filtering.yaml | 6 -- jjb/sxp/sxp-csit-performance.yaml | 6 -- jjb/sxp/sxp-csit-topology.yaml | 6 -- jjb/sxp/sxp.yaml | 28 ------- jjb/telemetry/telemetry-csit-basic.yaml | 2 - jjb/telemetry/telemetry.yaml | 25 ------ jjb/transportpce/transportpce.yaml | 26 ------ jjb/tsdr/tsdr-csit-cassandra.yaml | 6 -- jjb/tsdr/tsdr-csit-elasticsearch.yaml | 6 -- jjb/tsdr/tsdr-csit-hbase.yaml | 6 -- jjb/tsdr/tsdr-csit-hsqldb.yaml | 6 -- jjb/tsdr/tsdr.yaml | 23 ------ jjb/unimgr/unimgr.yaml | 24 ------ jjb/usc/usc-csit-tcp.yaml | 2 - jjb/usc/usc.yaml | 19 ----- jjb/yangtools/yangtools-csit-system.yaml | 2 - jjb/yangtools/yangtools-patch-test.yaml | 2 - 155 files changed, 11 insertions(+), 1643 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-neon.yaml delete mode 100644 jjb/autorelease/view-autorelease-neon.yaml delete mode 100644 jjb/coretutorials/coretutorials.yaml delete mode 100644 jjb/integration/csit-jobs-neon.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 0d8d75ac2..f4a417c62 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -21,9 +21,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' - testplan: '{project}-{functionality}-neon.txt' install: - all: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 5c254fb5c..ccb197642 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -15,8 +15,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index b1a4f8192..ad1b3edc6 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -73,30 +73,6 @@ # Used by the release job staging-profile-id: 9318cf3c82c33 -- project: - name: aaa-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: diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml index dc359c756..cf2e9954a 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -72,30 +72,6 @@ # 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: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index f06a3f08c..265dd0bb7 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 15bbeb59f..dd766f10c 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -60,26 +60,6 @@ # Used by the release job staging-profile-id: 931eabae9693c -- project: - name: alto-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: diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml index e48200e20..780d2064e 100644 --- a/jjb/ansible/ansible.yaml +++ b/jjb/ansible/ansible.yaml @@ -15,8 +15,6 @@ branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' project: ansible project-name: ansible diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 0cb92fb19..c5924cebe 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -71,29 +71,6 @@ # Used by the release job staging-profile-id: d88dcfe6ce48d -- project: - name: archetypes-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: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index bbad8f62c..f15d67080 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -17,10 +17,6 @@ - sodium: branch: 'stable/sodium' integration-test: sodium - - neon: - branch: 'stable/neon' - integration-test: neon - cron: '@weekly' project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 8667b2331..5d46c1a8b 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -468,7 +468,7 @@ 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' diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 672a199dd..88efcc96a 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -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 index 3085dec94..000000000 --- a/jjb/autorelease/validate-autorelease-neon.yaml +++ /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 index 207aef149..000000000 --- a/jjb/autorelease/view-autorelease-neon.yaml +++ /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 diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 234c1570b..244f96fcb 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 386d9fad4..ced3840df 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -21,8 +21,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 57cee509d..15d27ff90 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 856a65492..2a9cad380 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -23,8 +23,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index f9430de84..dd2cfa62c 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index bdee08fe2..6576c79a9 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index e556ae51f..f452b88f9 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 704397a30..fd8753ba3 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -17,8 +17,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' feature: - bgp: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 23d8e956e..aaead5681 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -94,37 +94,6 @@ # Used by the release job staging-profile-id: 9427a05049030 -- project: - name: bgpcep-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: diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index f705a3f18..6ed2d87b4 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -22,11 +22,9 @@ 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: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 0d7c677fe..e8d9f2ae7 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -63,27 +63,6 @@ # Used by the release job staging-profile-id: 942a8075b1f2a -- project: - name: bier-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: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index fe0191b8d..ff1208e9a 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -74,31 +74,6 @@ # 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: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 8eb807845..c95eb3a53 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -19,8 +19,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 928a39ef8..957775a9e 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 65aa0a6af..4d2aba33e 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -23,8 +23,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 90352ea8f..726bc9995 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -23,8 +23,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 0018a8248..e3470f6d4 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -23,8 +23,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index e8cb03bb8..8478e19fa 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -23,8 +23,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 1ae96bd6c..233f2b711 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -23,8 +23,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index adabb3919..45d12958a 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -23,8 +23,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 06cc97256..ddf01235f 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index c482bbeb4..0fe0026ff 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 1c69e6869..ed408a319 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 9f2b57789..6078eed66 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index d65404005..8e44441be 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -15,8 +15,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 7d46ad5c6..0fd152377 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -81,34 +81,6 @@ # 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 index 68de249f1..000000000 --- a/jjb/coretutorials/coretutorials.yaml +++ /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 diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index d59198160..1bab2dc61 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 67d500fdc..81e3800d7 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 556ac2a7e..4a7bafd25 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -73,30 +73,6 @@ # Used by the release job staging-profile-id: 96e4dade34bd7 -- project: - name: daexim-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: diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 245692b0d..43cdb93cf 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -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 @@ -196,9 +196,6 @@ 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, @@ -226,12 +223,3 @@ 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 diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index b6e9295c8..e4e898f7e 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 982601c81..3f93d2cdf 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -60,26 +60,6 @@ # Used by the release job staging-profile-id: 96e6fb1e65bf9 -- project: - name: dluxapps-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: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index ce5be8ea2..857850373 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' project: docs project-name: docs diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 84ea8aa68..43ff1abc3 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -24,8 +24,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index a9fb132c6..22019011b 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -15,8 +15,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index a58e783e4..55cb30624 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -106,41 +106,6 @@ # 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: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 05d84a605..5145980d9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -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: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index c52fa0a45..65bf71280 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -21,8 +21,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 5e6f5a28e..eb92ba31c 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index d65c801dc..3371ae968 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index 3e78d0547..c0fcd1631 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index eb3cb602b..d44e686f9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -81,33 +81,6 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 -- project: - name: groupbasedpolicy-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: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index ad61a69ae..c185bf126 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -15,8 +15,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 0e5f0119f..6c1079c39 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -79,32 +79,6 @@ # Used by the release job staging-profile-id: 96fca0367756c -- project: - name: infrautils-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 index 0289ff58a..000000000 --- a/jjb/integration/csit-jobs-neon.lst +++ /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, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 35c33656a..e90c66301 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 772ba0750..ed0ef380c 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -39,16 +39,6 @@ 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 @@ -128,24 +118,6 @@ 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 @@ -186,12 +158,6 @@ 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 @@ -219,8 +185,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' - project: name: distribution-sonar diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 0b06e561b..ec2d9bd12 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -47,15 +47,6 @@ 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 @@ -103,18 +94,6 @@ last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used csit-list: !include: csit-jobs-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 @@ -136,10 +115,6 @@ 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' @@ -597,53 +572,3 @@ 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 diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 8ee71ddee..a29ce9835 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 7e12df969..354db8a4b 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -73,29 +73,6 @@ # 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: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index db2687d8e..a2ccbb105 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -21,8 +21,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index c83124089..a35111d36 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -21,8 +21,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index a4bf5a4dd..23ab9c4c2 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 9b161f4ae..268b6223c 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -18,8 +18,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 20dcd26ff..ca8c2fd8b 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -72,30 +72,6 @@ # Used by the release job staging-profile-id: 96fee85953ca0 -- project: - name: l2switch-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: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index b2e8a24b6..3df1c63d2 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 5d8336bf0..4a8c17c05 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index acab71681..bf8b6d3ff 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -96,39 +96,6 @@ # 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: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index deb5c3dee..aeff6c4f8 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index dc1aa8f29..57fc332f2 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -15,8 +15,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index d74980f50..b68471a95 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 735706fd7..bb532eb00 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a67a9890f6202 -- project: - name: nemo-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: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index fa1e35b84..7c54ff96d 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 7879f3579..f55ef62a4 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index fea79f43c..8b83aebe9 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index dc7215445..47b6c614d 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -15,8 +15,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index ab6d8df66..3c3b69af8 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: @@ -70,11 +68,6 @@ 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: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 91ff60f94..02f2ffbdc 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -24,8 +24,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index d983fb0f9..89da37c72 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -82,33 +82,6 @@ # Used by the release job staging-profile-id: a67b22fc3663f -- project: - name: netconf-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: diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 4cee0b7fe..80d00fb7a 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -147,52 +147,3 @@ odl-ml2-port-binding: 'pseudo-agentdb-binding' openstack_system_image: '{openstack_queens_system_image}' openstack_system2_image: '{openstack_queens_system_image}' - -- project: - name: netvirt-csit-hwvtep-openstack-integration-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}' diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml index 5bc86374d..075701fae 100644 --- a/jjb/netvirt/netvirt-csit-multi-apex.yaml +++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml @@ -16,8 +16,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' testplan: '{project}-{topology}-openstack.txt' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 4d829e8c3..9dbe3bbcc 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -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' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 15cd28615..3a3913756 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -265,84 +265,6 @@ 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: @@ -368,8 +290,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' topology: - 1node: diff --git a/jjb/netvirt/netvirt-job-reports.yaml b/jjb/netvirt/netvirt-job-reports.yaml index 97d4693b2..5ea926796 100644 --- a/jjb/netvirt/netvirt-job-reports.yaml +++ b/jjb/netvirt/netvirt-job-reports.yaml @@ -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}' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 8e07d2b9c..b745f5f9f 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -15,8 +15,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index b0afc46ea..f3932e81b 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -117,44 +117,6 @@ # 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: diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 2c79fccf2..18180a94a 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -13,8 +13,6 @@ branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 4ac441c60..dab038e5f 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -64,27 +64,6 @@ # 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: diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index f03912f5d..0141f7801 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -13,8 +13,6 @@ branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index c66675923..a84a280e6 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -18,8 +18,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' functionality: - 'upstream' diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index 67f5768d5..c3503a955 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -14,8 +14,6 @@ branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' feature: - current: diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index f3d7cc3b5..ca1c3f774 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -18,8 +18,6 @@ branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' project: odltools project-name: odltools diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 2654fe70b..a4abe3060 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a6880455efe67 -- project: - name: of-config-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: diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 055b1c22d..3fca0825a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -18,8 +18,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index ab79f3271..be28da8d5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index d7937aa34..27007e3d0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 61116a0fa..ff8f0e119 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 8a2055228..2e25311f6 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 1b1870945..b595352b1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 1d14c2bc5..6fe25d0fd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -24,8 +24,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index cfc24608e..c690cc11c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index e5372c422..da81f9e39 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index be78a664e..4c3fdfdb2 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -21,8 +21,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index cfc8f6429..2f15c4062 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index c90e944a0..54a71fbf3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 686c0c73c..74a5ef9fc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 320c860d5..d5d2ecac1 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -17,8 +17,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 5d40fcf36..d6e473db8 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -109,39 +109,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-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: diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 53e085f0f..3d6531ae5 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -21,11 +21,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - 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' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 002d1ed62..b5cc790e3 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -25,11 +25,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - neon: - branch: 'stable/neon' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' project-name: 'opflex' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 40a4c9e8e..111d1fb10 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index a9cbe5b17..9e4848f67 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -22,8 +22,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index e8245a6d9..dc40a1935 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -12,8 +12,6 @@ branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' project: 'ovsdb' archive-artifacts: '*.log' diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 9663ee6e5..c52b34d36 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -16,8 +16,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index af71e7880..139dcc56e 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -88,35 +88,6 @@ # 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: diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 87732e3da..1d5d28b65 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a68bf26e208d4 -- project: - name: p4plugin-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: diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh index 24aed852e..402bc882b 100644 --- a/jjb/packaging/build-rpm-snap.sh +++ b/jjb/packaging/build-rpm-snap.sh @@ -15,9 +15,7 @@ $PYTHON -m pip install --upgrade pip $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt" # Convert stream to numeric ODL major version -if [ "$STREAM" == "neon" ]; then - VERSION_MAJOR=10 -elif [ "$STREAM" == "sodium" ]; then +if [ "$STREAM" == "sodium" ]; then VERSION_MAJOR=11 elif [ "$STREAM" == "magnesium" ]; then VERSION_MAJOR=12 diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 304cf03d6..17b19f6ca 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -27,7 +27,6 @@ project: 'integration/packaging' stream: - - neon - sodium distro: @@ -219,13 +218,6 @@ 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 @@ -233,12 +225,6 @@ - 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' @@ -286,13 +272,6 @@ 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 @@ -300,27 +279,6 @@ - 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 diff --git a/jjb/packaging/test-rpm-docker.sh b/jjb/packaging/test-rpm-docker.sh index c0c1701c1..11b94e5dd 100644 --- a/jjb/packaging/test-rpm-docker.sh +++ b/jjb/packaging/test-rpm-docker.sh @@ -26,7 +26,7 @@ sudo docker exec "$docker_id" /bin/bash $scripts_path/start-odl.sh sudo docker exec "$docker_id" /bin/bash $scripts_path/test-ports-nofeature.sh # Don't install test feature and check REST for Oxygen, ODLPARENT-139 breaks it -if [ "$STREAM" == "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 diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index d1355abd3..dd794b7fd 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -23,8 +23,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 0997797ae..4508aec63 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a68ca4a24655c -- project: - name: packetcable-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: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 00bd91e7c..2397c85df 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -13,8 +13,6 @@ branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' jdk: 'openjdk8' diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index c726ad13d..2a87a1f76 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -97,38 +97,6 @@ # Used by the release job staging-profile-id: 12cc4ba8bf01ba -- project: - name: serviceutils-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: diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 4cfabd8a5..5bbfbdcba 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 6298d7fd0..80d389143 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -21,8 +21,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index e3734df41..42f334eb6 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -17,8 +17,6 @@ java-version: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index a4f2bcc1c..bd0daa5a1 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -11,8 +11,6 @@ branch: 'stable/magnesium' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' project: 'sfc' project-name: 'sfc' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index c46aca90d..ed7f35ede 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -77,32 +77,6 @@ # 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: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 14c91faf1..cbca6396b 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -54,24 +54,6 @@ # Used by the release job staging-profile-id: a68fb236b93a6 -- project: - name: snmp-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: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 568bb9ba7..358f7ead7 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -69,29 +69,6 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 -- project: - name: snmp4sdn-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: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index e5a3f7d63..28b1270e3 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -20,12 +20,6 @@ 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: diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index 93dcaa0db..d6c9a4ff3 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -20,12 +20,6 @@ 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: diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index 4ab1a47e4..52d70be19 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -20,12 +20,6 @@ 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: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index a15cf06fb..7fc430817 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -20,12 +20,6 @@ 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: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index cdbb10396..a83f648ee 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -20,12 +20,6 @@ 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: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 1ad7ab22c..4af044b96 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -20,12 +20,6 @@ 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: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 1e74c4093..443585b0c 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -20,12 +20,6 @@ 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: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 14b655fc7..a19648c52 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -82,34 +82,6 @@ # 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: diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml index 0ac33f1ef..af637e1d6 100644 --- a/jjb/telemetry/telemetry-csit-basic.yaml +++ b/jjb/telemetry/telemetry-csit-basic.yaml @@ -21,8 +21,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index 7fd08fdf3..e52de623f 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -75,31 +75,6 @@ # 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: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 8bb59f306..762559292 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -80,32 +80,6 @@ # 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: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index a260f5fdd..c1df5fbcd 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -21,12 +21,6 @@ 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: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index c3c784012..6e4de655e 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -21,12 +21,6 @@ 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: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index b12efaa39..d7b38c30b 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -21,12 +21,6 @@ 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: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index ebd5dda62..a58b1ba6b 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -21,12 +21,6 @@ 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: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 88b16cdd7..d822df341 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -69,29 +69,6 @@ # Used by the release job staging-profile-id: a69373036303c -- project: - name: tsdr-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: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 5ff0630b2..d597f70f6 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -72,30 +72,6 @@ # 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: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 98b528163..2f2b42e46 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -21,8 +21,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - all: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index eddcf409e..0f12b8a2e 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -57,25 +57,6 @@ # Used by the release job staging-profile-id: a697b633b3ffe -- project: - name: usc-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: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 7fd5210fb..202c028d8 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -20,8 +20,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' install: - only: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index ddad34fdd..a9808ef69 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -15,8 +15,6 @@ jre: 'openjdk11' - sodium: branch: 'stable/sodium' - - neon: - branch: 'stable/neon' os-branch: 'queens' jdk: 'openjdk8' -- 2.36.6