From 2e490c48d15d9e18a62efc274e2df774a506f6b6 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Fri, 18 Sep 2020 15:51:46 +1000 Subject: [PATCH] Purge ODL Sodium jobs from builder Sodium is EOL since Aluminium is released the branch is locked, we no longer require jobs for the branch. Change-Id: I4397e71c22bb411e7ff2ce65a579b4818f085769 Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 2 - jjb/aaa/aaa-patch-test.yaml | 2 - jjb/aaa/aaa.yaml | 24 -- jjb/alt-datastores/alt-datastores.yaml | 24 -- jjb/ansible/ansible.yaml | 2 - jjb/archetypes/archetypes.yaml | 17 -- jjb/autorelease/autorelease-projects.yaml | 37 --- jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 - .../validate-autorelease-sodium.yaml | 41 --- jjb/autorelease/view-autorelease-sodium.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 | 27 -- jjb/daexim/daexim-csit-basic.yaml | 2 - jjb/daexim/daexim-csit-clustering-basic.yaml | 2 - jjb/daexim/daexim.yaml | 24 -- jjb/defaults.yaml | 18 +- jjb/dlux/dlux.yaml | 17 -- jjb/dluxapps/dluxapps-csit-yangman.yaml | 2 - jjb/dluxapps/dluxapps.yaml | 20 -- jjb/docs/docs-projects.yaml | 2 - jjb/docs/docs-rtd.yaml | 2 - jjb/genius/genius-csit-genius.yaml | 2 - jjb/genius/genius-patch-test.yaml | 2 - jjb/genius/genius.yaml | 32 --- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 27 -- jjb/infrautils/infrautils-patch-test.yaml | 2 - jjb/infrautils/infrautils.yaml | 26 -- jjb/integration/csit-jobs-sodium.lst | 68 ----- .../distribution-csit-userfeatures.yaml | 2 - .../distribution/distribution-jobs.yaml | 36 --- jjb/integration/integration-test-jobs.yaml | 29 -- jjb/integration/multipatch-distribution.sh | 11 +- 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 | 48 ---- .../lispflowmapping-csit-msmr.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 | 8 - jjb/netconf/netconf-userfeatures.yaml | 2 - jjb/netconf/netconf.yaml | 27 -- .../netvirt-csit-hwvtep-openstack.yaml | 51 ---- .../netvirt-csit-multi-openstack-upgrade.yaml | 46 ---- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 255 ------------------ jjb/netvirt/netvirt-job-reports.yaml | 8 +- jjb/netvirt/netvirt-patch-test.yaml | 2 - jjb/netvirt/netvirt.yaml | 35 --- 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 | 3 - .../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 | 26 -- jjb/p4plugin/p4plugin.yaml | 19 -- 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 | 2 - jjb/sxp/sxp-csit-binding-origin.yaml | 2 - jjb/sxp/sxp-csit-cluster-binding.yaml | 2 - jjb/sxp/sxp-csit-clustering.yaml | 2 - jjb/sxp/sxp-csit-filtering.yaml | 2 - jjb/sxp/sxp-csit-performance.yaml | 2 - jjb/sxp/sxp-csit-topology.yaml | 2 - 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 | 2 - jjb/tsdr/tsdr-csit-elasticsearch.yaml | 2 - jjb/tsdr/tsdr-csit-hbase.yaml | 2 - jjb/tsdr/tsdr-csit-hsqldb.yaml | 2 - 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 - 145 files changed, 14 insertions(+), 1721 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-sodium.yaml delete mode 100644 jjb/autorelease/view-autorelease-sodium.yaml delete mode 100644 jjb/integration/csit-jobs-sodium.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index b193a112d..73c4d663e 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 6a8d125a7..cb9f2a911 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -16,8 +16,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index e4bd2025b..83ef5a143 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -74,30 +74,6 @@ # Used by the release job staging-profile-id: 9318cf3c82c33 -- project: - name: aaa-sodium - 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: sodium - project: "aaa" - project-name: "aaa" - branch: "stable/sodium" - 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 4f13c9dc1..5559a4f3e 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -71,30 +71,6 @@ # Used by the release job staging-profile-id: daa2b00117ed6 -- project: - name: alt-datastores-sodium - 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: sodium - project: "alt-datastores" - project-name: "alt-datastores" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml index c4c881183..5180cfab2 100644 --- a/jjb/ansible/ansible.yaml +++ b/jjb/ansible/ansible.yaml @@ -15,8 +15,6 @@ branch: "stable/aluminium" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" project: ansible project-name: ansible diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 006b92deb..b27c809a2 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -53,23 +53,6 @@ # Used by the release job staging-profile-id: d88dcfe6ce48d -- project: - name: archetypes-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "archetypes" - project-name: "archetypes" - branch: "stable/sodium" - 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 3b49e34de..63648759c 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -1,41 +1,4 @@ --- -- project: - name: autorelease-projects - jobs: - - autorelease-branch-cut - - "autorelease-generate-release-notes-{stream}" - - "autorelease-release-{stream}-{mvn-version}-{java-version}": - build-node: centos7-builder-4c-16g - - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}" - - stream: - - sodium: - branch: "stable/sodium" - integration-test: sodium - cron: "@weekly" - - project: releng/autorelease - project-name: autorelease - build-node: centos7-builder-2c-8g - # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280 - archive-artifacts: > - **/*.prop - **/*.log - **/target/surefire-reports/*-output.txt - **/target/failsafe-reports/failsafe-summary.xml - **/hs_err_*.log - **/target/feature/feature.xml - staging-profile-id: 425e43800fea70 - # TODO: **/*.hprof is too large, compress with xz first - mvn-params: > - -PrepoBuild - -P!karaf - -Pignore-lispflowmapping-integrationtest - -Dcheckstyle.skip=true - -Dskip.karaf.featureTest=true - -Dsft.heap.max=4g - java-version: openjdk8 - - project: name: autorelease-projects-openjdk11 jobs: diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 66caa8b62..9fdef3ef4 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -467,7 +467,7 @@ name: RELEASE description: | Release to generate release notes for. - Eg. Sodium-SR1, Magnesium-SR2... + Eg. Magnesium-SR2, Silicon-SR1 ... 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 e62c810ad..1672c402c 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -17,5 +17,3 @@ branch: "stable/aluminium" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" diff --git a/jjb/autorelease/validate-autorelease-sodium.yaml b/jjb/autorelease/validate-autorelease-sodium.yaml deleted file mode 100644 index eede8a2ee..000000000 --- a/jjb/autorelease/validate-autorelease-sodium.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-sodium - jobs: - - "{project-name}-validate-autorelease-{stream}" - stream: sodium - branch: stable/sodium - 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-sodium.yaml b/jjb/autorelease/view-autorelease-sodium.yaml deleted file mode 100644 index c949f00b4..000000000 --- a/jjb/autorelease/view-autorelease-sodium.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job -- releng_view: &releng_autorelease_view_common_sodium - name: releng-view-autorelease-sodium - 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-Sodium - description: "List of Sodium Merge jobs for Autorelease" - job-name: - - "aaa-merge-sodium" - - "bgpcep-merge-sodium" - - "controller-merge-sodium" - - "coe-merge-sodium" - - "daexim-merge-sodium" - - "genius-merge-sodium" - - "infrautils-merge-sodium" - - "integration/distribution-merge-sodium" - - "lispflowmapping-merge-sodium" - - "netconf-merge-sodium" - - "netvirt-merge-sodium" - - "neutron-merge-sodium" - - "openflowplugin-merge-sodium" - - "ovsdb-merge-sodium" - - "serviceutils-merge-sodium" - - "sfc-merge-sodium" - <<: *releng_autorelease_view_common_sodium diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index ee5a334fe..e4ef3b03a 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 89a6bf56f..fafc4c483 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index b0199200c..876dc6350 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 7f9e2cd85..05595801c 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -24,8 +24,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index d6d8229f4..ee582587d 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index cf752231f..878165f7e 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 4d813874d..247e94d53 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index a41bcccf3..66655a6d1 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -18,8 +18,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" feature: - bgp: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index a31d0858c..0f71cb4be 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -95,37 +95,6 @@ # Used by the release job staging-profile-id: 9427a05049030 -- project: - name: bgpcep-sodium - 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: sodium - project: "bgpcep" - project-name: "bgpcep" - build-node: centos7-builder-8c-8g - build-timeout: 120 - branch: "stable/sodium" - 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 2479a0729..85f651755 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -23,11 +23,9 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" - verify-stream: "sodium" - verify-branch: "stable/sodium" + verify-stream: "magnesium" + verify-branch: "stable/magnesium" verify-karaf-version: "karaf4" install: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 789c0ddca..f80d7ac7a 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -62,27 +62,6 @@ # Used by the release job staging-profile-id: 942a8075b1f2a -- project: - name: bier-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "bier" - project-name: "bier" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 6392e1cde..23104b166 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-sodium - 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: sodium - branch: "stable/sodium" - 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 5bb684038..c110d9e5d 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -20,8 +20,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index e6ed39b34..8dd96a237 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 7d8a9bcc9..f7c374bf3 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -24,8 +24,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 3f2deba29..e079a4e17 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -24,8 +24,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" 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 ecd6bc93f..2c40dce9c 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -24,8 +24,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 23bb7c0d4..22abf952d 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -24,8 +24,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 9a0eae353..4420b17f0 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -24,8 +24,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index bcd33f87c..4756dbf84 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -24,8 +24,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 6cb8b005a..e09d091ce 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 5d905d957..db2ddc75a 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index a814c67fd..b29b2ca56 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" 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 643daafa1..cc683e28a 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index eded0676d..6a12e7faa 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -16,8 +16,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index ae9c7a24e..6cdaf1ef9 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -54,33 +54,6 @@ # Used by the release job staging-profile-id: 96c1c9177efdd -- project: - name: controller-sodium - jobs: - - "{project-name}-distribution-check-{stream}" - - "{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: sodium - project: "controller" - project-name: "controller" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 6f5a927be..7b3255a59 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index f811cea43..26b3f5eb6 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 481a14664..87482709a 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -74,30 +74,6 @@ # Used by the release job staging-profile-id: 96e4dade34bd7 -- project: - name: daexim-sodium - 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: sodium - branch: "stable/sodium" - 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 140f7872b..f271e09b5 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -104,9 +104,9 @@ # Data for csit-verify jobs # Branch for "last" version detection - verify-branch: stable/sodium + verify-branch: stable/magnesium # Value for ODL_STREAM - verify-stream: sodium + verify-stream: magnesium verify-karaf-version: karaf4 verify-jdkversion: openjdk8 @@ -214,8 +214,6 @@ yangtools-csit-1node-system-only-aluminium csit-mri-list-magnesium: > yangtools-csit-1node-system-only-magnesium - csit-mri-list-sodium: > - yangtools-csit-1node-system-only-sodium csit-sanity-list-silicon: > openflowplugin-csit-1node-sanity-only-silicon, distribution-sanity-silicon @@ -225,9 +223,6 @@ csit-sanity-list-magnesium: > openflowplugin-csit-1node-sanity-only-magnesium, distribution-sanity-magnesium - csit-sanity-list-sodium: > - openflowplugin-csit-1node-sanity-only-sodium, - distribution-sanity-sodium csit-weekly-list-silicon: > controller-csit-1node-notifications-longevity-only-silicon, controller-csit-3node-drb-partnheal-longevity-only-silicon, @@ -255,12 +250,3 @@ distribution-deploy-magnesium, distribution-offline-magnesium, openflowplugin-csit-1node-longevity-only-magnesium - csit-weekly-list-sodium: > - controller-csit-1node-notifications-longevity-only-sodium, - controller-csit-3node-drb-partnheal-longevity-only-sodium, - controller-csit-3node-drb-precedence-longevity-only-sodium, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-sodium, - bgpcep-csit-3node-bgpclustering-longevity-only-sodium, - distribution-deploy-sodium, - distribution-offline-sodium, - openflowplugin-csit-1node-longevity-only-sodium diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 68e1038b8..9413a3ffd 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -17,23 +17,6 @@ # Used by the release job staging-profile-id: 96e6a0327484f -- project: - name: dlux-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "dlux" - project-name: "dlux" - branch: "stable/sodium" - mvn-settings: "dlux-settings" - dependencies: "odlparent-merge-{stream}" - email-upstream: "[dlux] [odlparent]" - - # Used by the release job - staging-profile-id: 96e6a0327484f - - project: name: dlux-release-management jobs: diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 870652eac..867cd6c33 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 230b17eed..e1fba2c64 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -59,26 +59,6 @@ # Used by the release job staging-profile-id: 96e6fb1e65bf9 -- project: - name: dluxapps-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - project: "dluxapps" - project-name: "dluxapps" - stream: sodium - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/docs/docs-projects.yaml b/jjb/docs/docs-projects.yaml index e24a45bfc..feddf52e0 100644 --- a/jjb/docs/docs-projects.yaml +++ b/jjb/docs/docs-projects.yaml @@ -8,6 +8,4 @@ branch: "master" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" build-node: centos7-builder-2c-2g diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index ed2bb9178..b3f5877bc 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: "stable/aluminium" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" project: docs project-name: docs diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index f4df8dc32..05e7b8017 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -25,8 +25,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index b70baf3fe..c4c539c48 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -16,8 +16,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index e86ee2c5c..0959fa964 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -98,38 +98,6 @@ # Used by the release job staging-profile-id: 96fb4b6d9d1ee -- project: - name: genius-sodium - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs" - - "{project-name}-rtd-jobs": - build-node: centos7-builder-2c-2g - project-pattern: genius - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ - rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "genius" - project-name: "genius" - branch: "stable/sodium" - 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.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 2bb19cc51..e5aea59ab 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -80,33 +80,6 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 -- project: - name: groupbasedpolicy-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "groupbasedpolicy" - project-name: "groupbasedpolicy" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index 14f6227c6..453383882 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -16,8 +16,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index e960ea191..bf679d201 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -51,32 +51,6 @@ # Used by the release job staging-profile-id: 96fca0367756c -- project: - name: infrautils-sodium - 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: sodium - project: "infrautils" - project-name: "infrautils" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst deleted file mode 100644 index 81a3406a3..000000000 --- a/jjb/integration/csit-jobs-sodium.lst +++ /dev/null @@ -1,68 +0,0 @@ -aaa-csit-1node-authn-all-sodium, -bgpcep-csit-1node-bgp-ingest-all-sodium, -bgpcep-csit-1node-bgp-ingest-mixed-all-sodium, -bgpcep-csit-1node-throughpcep-all-sodium, -bgpcep-csit-1node-userfeatures-all-sodium, -controller-csit-1node-akka1-all-sodium, -controller-csit-1node-benchmark-all-sodium, -controller-csit-1node-rest-cars-perf-all-sodium, -controller-csit-3node-benchmark-all-sodium, -controller-csit-3node-clustering-ask-all-sodium, -controller-csit-3node-clustering-tell-all-sodium, -controller-csit-3node-rest-clust-cars-perf-ask-only-sodium, -controller-csit-3node-rest-clust-cars-perf-tell-only-sodium, -daexim-csit-1node-basic-only-sodium, -daexim-csit-3node-clustering-basic-only-sodium, -distribution-csit-1node-userfeatures-all-sodium, -distribution-csit-managed-sodium, -genius-csit-1node-upstream-only-sodium, -genius-csit-3node-upstream-only-sodium, -lispflowmapping-csit-1node-msmr-all-sodium, -lispflowmapping-csit-3node-msmr-all-sodium, -netconf-csit-1node-callhome-only-sodium, -netconf-csit-1node-scale-max-devices-only-sodium, -netconf-csit-1node-scale-only-sodium, -netconf-csit-1node-userfeatures-all-sodium, -netconf-csit-1node-userfeatures-rfc8040-all-sodium, -netconf-csit-3node-clustering-only-sodium, -netconf-csit-3node-clustering-scale-only-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-sodium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-sodium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-sodium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-sodium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-sodium, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, -netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, -netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-sodium, -odltools-csit-1node-upstream-all-sodium, -openflowplugin-csit-1node-cbench-only-sodium, -openflowplugin-csit-1node-flow-services-all-sodium, -openflowplugin-csit-1node-perf-bulkomatic-only-sodium, -openflowplugin-csit-1node-perf-stats-collection-only-sodium, -openflowplugin-csit-1node-scale-link-only-sodium, -openflowplugin-csit-1node-scale-only-sodium, -openflowplugin-csit-1node-scale-switch-only-sodium, -openflowplugin-csit-3node-clustering-bulkomatic-only-sodium, -openflowplugin-csit-3node-clustering-only-sodium, -openflowplugin-csit-3node-clustering-perf-bulkomatic-only-sodium, -ovsdb-csit-1node-upstream-southbound-all-sodium, -ovsdb-csit-3node-upstream-clustering-only-sodium, -sfc-csit-3node-docker-full-deploy-all-sodium, -sfc-csit-3node-rest-basic-all-sodium, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 8427aaf68..11aa74593 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 0fdb9d559..dc75bac57 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -35,16 +35,6 @@ java-version: openjdk11 jre: "openjdk11" karaf-version: odl - - sodium: - branch: "stable/sodium" - 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 @@ -121,24 +111,6 @@ openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, - - sodium: - branch: "stable/sodium" - 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 @@ -179,12 +151,6 @@ karaf-version: odl dependencies: > distribution-merge-managed-{stream}, - - sodium: - branch: "stable/sodium" - karaf-version: odl - dependencies: > - distribution-merge-managed-{stream}, - transportpce-merge-{stream} - project: name: distribution-release @@ -213,8 +179,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" - project: name: distribution-sonar diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 9c4f1e023..034ec5a0e 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -49,15 +49,6 @@ daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt bgpcep integration/distribution - - sodium: - branch: "stable/sodium" - mvn-version: "mvn35" - csit-list: !include: csit-jobs-sodium.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 @@ -118,22 +109,6 @@ csit-list: !include: csit-jobs-magnesium.lst csit-mri-list: "{csit-mri-list-magnesium}" csit-weekly-list: "{csit-weekly-list-magnesium}" - - sodium: - branch: "stable/sodium" - csit-blocklist: > - alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo - p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools - gate longevity sanity tdd tempest wip - bgpcep-csit-3node-bgpclustering-all - bgpcep-csit-3node-bgpclustering-ha-only - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct - netvirt-csit-3node-1cmb - openflowplugin-csit-1node-bundle-based-reconciliation - 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-mri-list: "{csit-mri-list-sodium}" - csit-weekly-list: "{csit-weekly-list-sodium}" - project: name: integration-sanity @@ -155,10 +130,6 @@ branch: "stable/magnesium" karaf-version: odl csit-sanity-list: "{csit-sanity-list-magnesium}" - - sodium: - branch: "stable/sodium" - karaf-version: odl - csit-sanity-list: "{csit-sanity-list-sodium}" - job-template: name: "integration-merge-dashboard" diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh index a054e1fa0..92cc1e1c3 100755 --- a/jjb/integration/multipatch-distribution.sh +++ b/jjb/integration/multipatch-distribution.sh @@ -148,27 +148,27 @@ do git checkout FETCH_HEAD # If the patch is for MRI project, adjust the MRI versions # shellcheck disable=SC2235 - if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then + if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ]); then ODLPARENT_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:odlparent.version ../pom.xml)" echo "change odlparent version to ${ODLPARENT_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.odlparent\"\] -v "${ODLPARENT_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.odlparent\"\] -v "${ODLPARENT_VERSION}" fi # shellcheck disable=SC2235 - if [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then + if [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ]); then YANGTOOLS_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:yangtools.version ../pom.xml)" echo "change yangtools version to ${YANGTOOLS_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.yangtools\"\] -v "${YANGTOOLS_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.yangtools\"\] -v "${YANGTOOLS_VERSION}" fi # shellcheck disable=SC2235 - if [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then + if [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ]); then MDSAL_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:mdsal.version ../pom.xml)" echo "change mdsal version to ${MDSAL_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.mdsal\"\] -v "${MDSAL_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:groupId=\"org.opendaylight.mdsal\"\] -v "${MDSAL_VERSION}" fi - if [ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]; then + if [ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ]; then CONTROLLER_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:controller.version ../pom.xml)" echo "change controller version to ${CONTROLLER_VERSION}" find . -name "pom.xml" -print0 | xargs -0 xmlstarlet ed --inplace -P -N x=http://maven.apache.org/POM/4.0.0 -u //x:version\[../x:parent/x:groupId=\"org.opendaylight.controller\"\] -v "${CONTROLLER_VERSION}" @@ -177,7 +177,7 @@ do else # If project with no patch is MRI, download release tag: # shellcheck disable=SC2235 - if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ] && [ "${DISTROSTREAM}" != "sodium" ]); then + if [ "${PROJECT}" == "odlparent" ] || [ "${PROJECT}" == "yangtools" ] || [ "${PROJECT}" == "mdsal" ] || ([ "${PROJECT}" == "controller" ] && [ "${DISTROSTREAM}" != "magnesium" ]); then # shellcheck disable=SC2086 PROJECT_VERSION="$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v //x:${PROJECT_SHORTNAME}.version ../pom.xml)" echo "2. checking out tag v${PROJECT_VERSION}" @@ -243,4 +243,3 @@ for PROJECT_SHORTNAME in "${PROJECTS[@]}"; do $MAVEN_OPTIONS popd done - diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 498fc21ec..dc29dc04f 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 603124372..c1775f058 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -74,29 +74,6 @@ # Used by the release job staging-profile-id: 96fdf4408765d -- project: - name: jsonrpc-sodium - 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: sodium - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 55f97236b..48fb78346 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index a1d2e1a9b..5aada2912 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 4b831f8a3..d977e998d 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 635bbf2b3..83e39600f 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -19,8 +19,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 8e2b5f56d..32a4ec7f8 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -23,30 +23,6 @@ # Used by the release job staging-profile-id: 96fee85953ca0 -- project: - name: l2switch-aluminium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: aluminium - project: "l2switch" - project-name: "l2switch" - branch: "stable/aluminium" - 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-magnesium jobs: @@ -71,30 +47,6 @@ # Used by the release job staging-profile-id: 96fee85953ca0 -- project: - name: l2switch-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "l2switch" - project-name: "l2switch" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index b706b2f5d..99f979c46 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index ec9c685ba..ebeadb63a 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -95,39 +95,6 @@ # Used by the release job staging-profile-id: 96fff2503b766 -- project: - name: lispflowmapping-sodium - 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: sodium - project: "lispflowmapping" - project-name: "lispflowmapping" - branch: "stable/sodium" - 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 87ab3d30b..f35425af2 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index 4cd6c3656..79cb62eb5 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -16,8 +16,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index c8d251539..94a514799 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 62f863c28..827bc49d7 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a67a9890f6202 -- project: - name: nemo-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "nemo" - project-name: "nemo" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index d47eb711a..0c3e439e3 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 3e9a2e9d8..83b079bc5 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index d7b85ab62..350b8c74c 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 6cb0c6e13..ac880062c 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -16,8 +16,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index d4cc0a468..75ae8c656 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: @@ -68,12 +66,6 @@ "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250 -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*" - - sodium: - branch: "stable/sodium" - 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 c3ca4ad20..79e53256f 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -27,8 +27,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index eac56d0ea..278f8f3d0 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -83,33 +83,6 @@ # Used by the release job staging-profile-id: a67b22fc3663f -- project: - name: netconf-sodium - 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: sodium - project: "netconf" - project-name: "netconf" - branch: "stable/sodium" - 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 ee9823ac4..894e386ed 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -202,54 +202,3 @@ openstack_system_image: "{openstack_stein_system_image}" openstack_system2_image: "{openstack_stein_system_image}" schedule: "{schedule-weekly}" - -- project: - name: netvirt-csit-hwvtep-openstack-integration-sodium-rocky - jobs: - - inttest-csit-hwvtep-openstack-custom - - project: "netvirt" - stream: "sodium" - branch: "stable/sodium" - 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-2 - 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 - x86_64 - 20200811-124233.615 - 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: - schedule: "{schedule-weekly}" - - gate-stateful - - openstack: - - rocky: - openstack-branch: "stable/rocky" - odl-ml2-branch: "stable/rocky" - odl-ml2-port-binding: "pseudo-agentdb-binding" - openstack_system_image: "{openstack_rocky_system_image}" - openstack_system2_image: "{openstack_rocky_system_image}" - schedule: "{schedule-weekly}" diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 541bd6b43..361635ddb 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -1,50 +1,4 @@ --- -- project: - name: netvirt-csit-upgrade-openstack-integration-rocky - jobs: - - inttest-csit-openstack-custom - - project: "netvirt" - - stream: - - sodium: - branch: "stable/sodium" - - testplan: "{project}-{topology}-openstack-upgrade.txt" - odl-ml2-driver-version: "v2" - enable-openstack-services: "placement-api,l2gw-plugin" - enable-openstack-compute-services: "placement-client" - security-group-mode: "stateful" - group-add-mod-enabled: "true" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 - 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" - - functionality: - - upgrade: - schedule: "{schedule-weekly}" - - upgrade-snat-conntrack: - odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" - - openstack: - - rocky: - openstack-branch: "stable/rocky" - odl-ml2-branch: "stable/rocky" - odl-ml2-port-binding: "pseudo-agentdb-binding" - openstack_system_image: "{openstack_rocky_system_image}" - openstack_system2_image: "{openstack_rocky_system_image}" - - project: name: netvirt-csit-upgrade-openstack-integration-rocky-aluminium jobs: diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index b4262e377..5d7124ddb 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -418,259 +418,6 @@ openstack_system_image: "{openstack_stein_system_image}" openstack_system2_image: "{openstack_stein_system_image}" -- project: - name: netvirt-csit-openstack-integration-sodium-queens - jobs: - - inttest-csit-openstack-custom - - project: "netvirt" - stream: "sodium" - branch: "stable/sodium" - 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-2 - 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: - schedule: "{schedule-weekly}" - - upstream-stateful-itm-direct-tunnels: - enable-itm-direct-tunnels: "true" - schedule: "{schedule-weekly}" - - upstream-stateful-snat-conntrack: - odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" - - gate-stateful - - gate-stateful-itm-direct-tunnels: - enable-itm-direct-tunnels: "true" - schedule: "{schedule-weekly}" - - gate-stateful-snat-conntrack: - odl-snat-mode: "conntrack" - - gate-minimal-cluster: - testplan: "{project}-{topology}-minimal-openstack.txt" - - dcgw: - testplan: "{project}-{topology}-dcgw-openstack.txt" - schedule: "{schedule-weekly}" - tools_system_count: 3 - enable-gre-type-driver: "yes" - # 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: "{schedule-weekly}" - 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-weekly}" - - tempest-stateful-snat-conntrack: - test-suites: "openstack/tempest/tempest.robot" - testplan: "{project}-{topology}-openstack-tempest.txt" - odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" - - gate-tempest-stateful: - test-suites: "openstack/tempest/tempest.robot" - testplan: "{project}-{topology}-openstack-tempest.txt" - - gate-tempest-stateful-snat-conntrack: - test-suites: "openstack/tempest/tempest.robot" - testplan: "{project}-{topology}-openstack-tempest.txt" - odl-snat-mode: "conntrack" - - openstack: - - queens: - openstack-branch: "stable/queens" - odl-ml2-branch: "stable/queens" - odl-ml2-port-binding: "pseudo-agentdb-binding" - openstack_system_image: "{openstack_queens_system_image}" - openstack_system2_image: "{openstack_queens_system_image}" - schedule: "{schedule-weekly}" - -- project: - name: netvirt-csit-openstack-integration-sodium-rocky - jobs: - - inttest-csit-openstack-custom - - project: "netvirt" - stream: "sodium" - branch: "stable/sodium" - 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-2 - 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: - schedule: "{schedule-weekly}" - - upstream-stateful-itm-direct-tunnels: - enable-itm-direct-tunnels: "true" - schedule: "{schedule-weekly}" - - upstream-stateful-snat-conntrack: - odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" - - 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" - - dcgw: - testplan: "{project}-{topology}-dcgw-openstack.txt" - schedule: "{schedule-weekly}" - tools_system_count: 3 - enable-gre-type-driver: "yes" - # 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: "{schedule-weekly}" - 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-weekly}" - - tempest-stateful-snat-conntrack: - test-suites: "openstack/tempest/tempest.robot" - testplan: "{project}-{topology}-openstack-tempest.txt" - odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" - - 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: - - rocky: - openstack-branch: "stable/rocky" - odl-ml2-branch: "stable/rocky" - odl-ml2-port-binding: "pseudo-agentdb-binding" - openstack_system_image: "{openstack_rocky_system_image}" - openstack_system2_image: "{openstack_rocky_system_image}" - -- project: - name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-queens - jobs: - - inttest-csit-openstack-custom - - project: "netvirt" - testplan: "{project}-{topology}-openstack.txt" - odl-ml2-driver-version: "v2" - enable-openstack-services: "n-cpu,placement-api,tempest" - security-group-mode: "stateful" - odl_system_flavor: odl-highcpu-2 - openstack_system_flavor: odl-highcpu-8 - os-cmb-cnt: 1 - os-ctl-cnt: 0 - os-cmp-cnt: 0 - - stream: - - sodium: - branch: "stable/sodium" - - topology: - - 1node: - openstack_system2_count: 0 - odl_system_count: 1 - enable-haproxy: "no" - install-features: "odl-netvirt-openstack" - robot-options: "-v FAIL_ON_EXCEPTIONS:True" - - 3node: - openstack_system2_count: 1 - odl_system_count: 3 - enable-haproxy: "yes" - install-features: "odl-jolokia,odl-netvirt-openstack" - - functionality: - - upstream-stateful: - schedule: "{schedule-weekly}" - - upstream-stateful-itm-direct-tunnels: - enable-itm-direct-tunnels: "true" - schedule: "{schedule-weekly}" - - upstream-stateful-snat-conntrack: - odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" - - 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: "" - - tempest-stateful: - test-suites: "openstack/tempest/tempest.robot" - testplan: "{project}-{topology}-openstack-tempest.txt" - schedule: "{schedule-weekly}" - - tempest-stateful-snat-conntrack: - test-suites: "openstack/tempest/tempest.robot" - testplan: "{project}-{topology}-openstack-tempest.txt" - odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" - - gate-tempest-stateful: - test-suites: "openstack/tempest/tempest.robot" - testplan: "{project}-{topology}-openstack-tempest.txt" - - gate-tempest-stateful-snat-conntrack: - test-suites: "openstack/tempest/tempest.robot" - testplan: "{project}-{topology}-openstack-tempest.txt" - odl-snat-mode: "conntrack" - - openstack: - - queens: - openstack-branch: "stable/queens" - odl-ml2-branch: "stable/queens" - odl-ml2-port-binding: "pseudo-agentdb-binding" - openstack_system_image: "{openstack_queens_system_image}" - openstack_system2_image: "{openstack_queens_system_image}" - schedule: "{schedule-weekly}" - - project: name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-rocky jobs: @@ -691,8 +438,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" topology: - 1node: diff --git a/jjb/netvirt/netvirt-job-reports.yaml b/jjb/netvirt/netvirt-job-reports.yaml index 93151bf13..4530e8379 100644 --- a/jjb/netvirt/netvirt-job-reports.yaml +++ b/jjb/netvirt/netvirt-job-reports.yaml @@ -5,8 +5,8 @@ jobs: - netvirt-job-reports report-jobnames: > - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium + netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium + netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium report-logurl: "https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1" report-numjobs: 100 report-path: "/tmp/jobreports" @@ -34,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-sodium - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-sodium + netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium + netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium - string: name: LOG_URL default: "{report-logurl}" diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 949f7d406..aecfca9a5 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -16,8 +16,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "rocky" diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 3082deb68..69d950cdc 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -110,41 +110,6 @@ # Used by the release job staging-profile-id: a67da0ffbb1ba -- project: - name: netvirt-sodium - 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 - - stream: sodium - branch: "stable/sodium" - - 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 95a762f82..783fc8195 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -13,8 +13,6 @@ branch: "stable/aluminium" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" os-branch: "queens" diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 2986e88b0..82ae533cf 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -65,27 +65,6 @@ # Used by the release job staging-profile-id: a67e1b40d7419 -- project: - name: neutron-sodium - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs" - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "neutron" - project-name: "neutron" - build-timeout: 90 - branch: "stable/sodium" - 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 83cf52c09..a89a46509 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -13,8 +13,6 @@ branch: "stable/aluminium" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" os-branch: "queens" diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index 2ae9bab6a..327ad08a0 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -19,8 +19,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" functionality: - "upstream" diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index 721535e2a..ea11a7200 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -14,8 +14,6 @@ branch: "stable/aluminium" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" feature: - current: diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index 00ae32add..7ba16eaba 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -17,8 +17,6 @@ branch: "stable/aluminium" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" project: odltools project-name: odltools diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 79f6bd8aa..56b5fa56b 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a6880455efe67 -- project: - name: of-config-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "of-config" - project-name: "of-config" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index c8ff159c2..94b318161 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -19,8 +19,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 2871b5d4a..6d4765428 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 1ad7a9b2a..a616f29f7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 46df54ef1..88904df9d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index a6106e251..9795ad65e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 93fc31a8f..030f36646 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -26,9 +26,6 @@ branch: "stable/magnesium" jre: "openjdk11" install: "all" - - sodium: - branch: "stable/sodium" - install: "all" # Job images tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630" diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 5f08e6c7b..9e33a25ac 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -25,8 +25,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 02d15d2a8..bdbfda79e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 083e89f8d..6df51d475 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index c2c43c8cf..2da69e236 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 39e57d721..c34720b00 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 625824c5b..3107b4fda 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 952f57210..f58feb16b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 24d46a306..829abf6e0 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -18,8 +18,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index ae67c19f6..255010acf 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -101,39 +101,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-sodium - 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: sodium - project: "openflowplugin" - project-name: "openflowplugin" - branch: "stable/sodium" - 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 29a884499..d68668321 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -21,11 +21,6 @@ libuv-version: "1.20.2" rapidjson-version: "1.1.0" openvswitch-version: "2.12.0" - - sodium: - branch: "stable/sodium" - 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 8897ea969..f09d5a3f3 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -25,11 +25,6 @@ libuv-version: "1.20.2" rapidjson-version: "1.1.0" openvswitch-version: "2.12.0" - - sodium: - branch: "stable/sodium" - 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 6c0650931..aa65f175b 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 79413cd4c..001b04c98 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -23,8 +23,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index e0b58d5a3..fdbe98a0c 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -13,8 +13,6 @@ java-version: "openjdk11" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" project: "ovsdb" archive-artifacts: "*.log" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index de9fba5ac..dabb4fbbe 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -17,8 +17,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index b08de9f98..5955558ba 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -80,32 +80,6 @@ # Used by the release job staging-profile-id: a68b188166958 -- project: - name: ovsdb-sodium - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs" - - "{project-name}-rtd-jobs": - build-node: centos7-builder-2c-2g - project-pattern: ovsdb - rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/ - rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "ovsdb" - project-name: "ovsdb" - branch: "stable/sodium" - 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-info jobs: diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 2ba703392..c8832f824 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a68bf26e208d4 -- project: - name: p4plugin-sodium - jobs: - - "{project-name}-maven-javadoc-jobs" - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "p4plugin" - project-name: "p4plugin" - branch: "stable/sodium" - mvn-settings: "p4plugin-settings" - mvn-opts: "-Xmx1024m" - dependencies: "" - email-upstream: "[p4plugin]" - - # Used by the release job - staging-profile-id: a68bf26e208d4 - - project: name: p4plugin-release-management jobs: diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index d41cc10d5..090f53e52 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -24,8 +24,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 4bac2f7ef..fa9744e3c 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a68ca4a24655c -- project: - name: packetcable-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "packetcable" - project-name: "packetcable" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 11e3fe689..b435eab94 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -13,8 +13,6 @@ branch: "stable/aluminium" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index dd4642a3a..4926281f7 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -98,38 +98,6 @@ # Used by the release job staging-profile-id: 12cc4ba8bf01ba -- project: - name: serviceutils-sodium - 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/sodium" - stream: sodium - - 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 da86d76c7..50674360c 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 7739822f6..7a11c799c 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 781f4b464..3ea6e59d6 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -18,8 +18,6 @@ - magnesium: branch: "stable/magnesium" java-version: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index bb6defdd3..e690bfd59 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -11,8 +11,6 @@ branch: "stable/aluminium" - magnesium: branch: "stable/magnesium" - - sodium: - branch: "stable/sodium" project: "sfc" project-name: "sfc" diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 1862cf8fc..a18958e0e 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-sodium - 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: sodium - project: "sfc" - project-name: "sfc" - branch: "stable/sodium" - 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 62e66caf3..0f07d2e6f 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -53,24 +53,6 @@ # Used by the release job staging-profile-id: a68fb236b93a6 -- project: - name: snmp-sodium - jobs: - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "snmp" - project-name: "snmp" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 909353547..6025519f9 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -68,29 +68,6 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 -- project: - name: snmp4sdn-sodium - 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: sodium - project: "snmp4sdn" - project-name: "snmp4sdn" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index b70b02be4..bfea4a45f 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index bb49ee440..2d1f80319 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index 78a4e5db0..89e24da5a 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 987fe98dc..22dae0ec7 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index b21489ea9..08f5578aa 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index fa734f36a..9cb5c0de9 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 874aae89b..1d2b79faa 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 390ecdaf8..d78ccf77e 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -80,34 +80,6 @@ # Used by the release job staging-profile-id: a6909c75719b7 -- project: - name: sxp-sodium - 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: sodium - project: "sxp" - project-name: "sxp" - branch: "stable/sodium" - - 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-release-management jobs: diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml index d9af85a8a..c0b2d39c9 100644 --- a/jjb/telemetry/telemetry-csit-basic.yaml +++ b/jjb/telemetry/telemetry-csit-basic.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index 7ed6c8c94..ff87b8d81 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -74,31 +74,6 @@ # Used by the release job staging-profile-id: 8ed9c52266504 -- project: - name: telemetry-sodium - 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: sodium - project: "telemetry" - project-name: "telemetry" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 64b02a217..9e4f71649 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-sodium - 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-4c-16g - - odl-maven-jobs - - odl-maven-verify-jobs - - project: "transportpce" - project-name: "transportpce" - stream: sodium - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 056ad3c76..ebbc588c8 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 13d09c29b..982a932d9 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 6a0526c44..160f68b0d 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 41c1ea38c..5fe72bee6 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index b9092068d..c27264961 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -68,29 +68,6 @@ # Used by the release job staging-profile-id: a69373036303c -- project: - name: tsdr-sodium - 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: sodium - project: "tsdr" - project-name: "tsdr" - branch: "stable/sodium" - mvn-settings: "tsdr-settings" - mvn-opts: "-Xmx1024m" - dependencies: "" - email-upstream: "[tsdr]" - - # Used by the release job - staging-profile-id: a69373036303c - - project: name: tsdr-release-management jobs: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 11afb82b8..fdd45ceef 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -82,30 +82,6 @@ # Used by the release job staging-profile-id: a695d0a0b8d51 -- project: - name: unimgr-sodium - 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: sodium - project: "unimgr" - project-name: "unimgr" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 4389bc77a..e77b1baa4 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -22,8 +22,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - all: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 7a0bc0e32..7b3f549e5 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a697b633b3ffe -- project: - name: usc-sodium - jobs: - - "{project-name}-maven-javadoc-jobs" - - odl-maven-jobs - - odl-maven-verify-jobs - - stream: sodium - project: "usc" - project-name: "usc" - branch: "stable/sodium" - 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-release-management jobs: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 4c5e0daac..92148be94 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -21,8 +21,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" install: - only: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 8ad69652e..469af901e 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -16,8 +16,6 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" - - sodium: - branch: "stable/sodium" os-branch: "queens" jdk: "openjdk8" -- 2.36.6