Purge ODL Sodium jobs from builder 75/92475/1
authorAnil Belur <abelur@linuxfoundation.org>
Fri, 18 Sep 2020 05:51:46 +0000 (15:51 +1000)
committerAnil Belur <abelur@linuxfoundation.org>
Fri, 18 Sep 2020 06:18:50 +0000 (16:18 +1000)
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 <abelur@linuxfoundation.org>
145 files changed:
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alt-datastores/alt-datastores.yaml
jjb/ansible/ansible.yaml
jjb/archetypes/archetypes.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/validate-autorelease-sodium.yaml [deleted file]
jjb/autorelease/view-autorelease-sodium.yaml [deleted file]
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/coe/coe.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml
jjb/controller/controller.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-projects.yaml
jjb/docs/docs-rtd.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/csit-jobs-sodium.lst [deleted file]
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/multipatch-distribution.sh
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal-patch-test.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-job-reports.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron-patch-test.yaml
jjb/neutron/neutron.yaml
jjb/odlparent/odlparent-patch-test.yaml
jjb/odltools/odltools-csit.yaml
jjb/odltools/odltools-patch-test.yaml
jjb/odltools/odltools.yaml
jjb/of-config/of-config.yaml
jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/serviceutils/serviceutils-patch-test.yaml
jjb/serviceutils/serviceutils.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-binding-origin.yaml
jjb/sxp/sxp-csit-cluster-binding.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/telemetry/telemetry-csit-basic.yaml
jjb/telemetry/telemetry.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml

index b193a112d09b71f7ef2440c9e9f73091869287f9..73c4d663ec89987f3de842ddb8f69b139bb96af4 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 6a8d125a7542fa9cd954838a47e0fb3778a4e263..cb9f2a911fdf4f8476134019a501048641d1d631 100644 (file)
@@ -16,8 +16,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
 
index e4bd2025b298c69c05fdfeb603275b882ee10963..83ef5a143073cf9a6cc80fcdf3f8618ffb5a7b68 100644 (file)
     # 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:
index 4f13c9dc16b9f36c7499610486656825edfd0401..5559a4f3e85f9cf3fc5fd36d938f905a09c18358 100644 (file)
     # 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:
index c4c8811836c38992225172419093575d3d4b70ec..5180cfab298194ddd4bc1f6e2e9929fd48bf8174 100644 (file)
@@ -15,8 +15,6 @@
           branch: "stable/aluminium"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
 
     project: ansible
     project-name: ansible
index 006b92debb4588eaab82b3c8efd01849b9dae329..b27c809a27c0491495878cfd54d7d4e38df7ba4c 100644 (file)
     # 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:
index 3b49e34dea6bdf30d4833d288599eab8fac9637e..63648759c1f98a6a02d0b3830906ed5a7b374bd0 100644 (file)
@@ -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:
index 66caa8b625aa30a392cc2fa76bed98f9c86e7e0d..9fdef3ef4500e317324f3ea9dacf008d5c6055d2 100644 (file)
           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"
index e62c810adabba977715f4f33ad903c2f7c8a4b0a..1672c402c376234dc0066c8f98f8c86d866928a5 100644 (file)
@@ -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 (file)
index eede8a2..0000000
+++ /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 (file)
index c949f00..0000000
+++ /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
index ee5a334fee362611c650eeca56850372884cbb4c..e4ef3b03a7b1ef1f749c7d0efd3db5be1f698168 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 89a6bf56f027b479713860c90847cfb35af9c8b2..fafc4c483b7fe79bbec699cc0d2dc73d6c651cab 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index b0199200c2b5026842796e45e701be3c9d5b0880..876dc6350288a0b0989c5d3ed72ee99a855a7031 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 7f9e2cd854c71f9b4874422f11c8e57084d65821..05595801cd2fa9eabe985a31a7040a70f890d3c4 100644 (file)
@@ -24,8 +24,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index d6d8229f423385b8912ed2f5f023ab09e31fd9fb..ee582587d41f0c60b8e8a04179f478da38b644f3 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index cf752231fb5a1e96f330ef904c49927ee47f8bef..878165f7ef13e13132f72675e6f8b7f67e0220d3 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 4d813874d86b0b5f220cfebd666184d05e306b9d..247e94d53315aea75312489ce453b7fbe81ec2ba 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index a41bcccf3dffa6d9afefda4699f2e8b83b35ee55..66655a6d15549323d38fa7c1b9c23fe2d3a8a505 100644 (file)
@@ -18,8 +18,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     feature:
       - bgp:
index a31d0858c844cecb4f042744456f9a6ca996925e..0f71cb4bedc372e8a196ef9440953845633f8fcf 100644 (file)
     # 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:
index 2479a07297e59589360d77c602d5d68b799ecf95..85f6517558e3e6ca0b07b6b1df7f4df76e571d03 100644 (file)
       - 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:
index 789c0ddca616864965e34f8794d48550c7be5fbe..f80d7ac7aa8035115e468a9c53161bc5e6eaa709 100644 (file)
     # 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:
index 6392e1cde853baf1c29d3cd30430557ce6f60294..23104b16618939234c970826c0b0ddd961e258ee 100644 (file)
     # 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:
index 5bb684038f3eb8eba23063870f407a73689ebedf..c110d9e5da56f37bd0f37811c92a7f2606ea3153 100644 (file)
@@ -20,8 +20,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index e6ed39b347df785669af52adc8adaacff45a5dbc..8dd96a237601bbc7a6a3bdf232ef49c4272a9c22 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 7d8a9bcc9960fb4459a350a5dc391f253a835d46..f7c374bf3fa697c4025c983a0fbebefcf64fde54 100644 (file)
@@ -24,8 +24,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 3f2deba29a471443cd66ac649b663a1b8904b537..e079a4e17b9310d753e02da4d86cee7ef387c71a 100644 (file)
@@ -24,8 +24,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index ecd6bc93f7908da71d260c787e9679b7417f34fb..2c40dce9cf231123e12f4b0941704a4adfb5b268 100644 (file)
@@ -24,8 +24,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 23bb7c0d4705b5721c7bcf59f567022cd8065e94..22abf952db0d28627614e0de42441c98f6b94f8c 100644 (file)
@@ -24,8 +24,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 9a0eae3538cdbcadf91c0e25d7f39d6042ea618e..4420b17f0fe3283120981b1467fcf7b37a581663 100644 (file)
@@ -24,8 +24,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index bcd33f87c5f268ffefed6986d360e7b6a4cd0c8d..4756dbf8450551a7b5bf999367801cd5eb0cc2da 100644 (file)
@@ -24,8 +24,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 6cb8b005ad0f5057b013382c988d8416553954cd..e09d091ce5bcf3eecdc722d88f5da3cec5743f44 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 5d905d9576ad88773c2ac49915a358fa6ab7b32d..db2ddc75afa156815ae90f49a76fdd33e1d4e070 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index a814c67fd71404748112d4508b4d8b98e7f0b7ef..b29b2ca566fd04bc54787192daea69e9e7f79313 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 643daafa104fc37e66635f174dbc54c5fd2eda50..cc683e28a3f55fbcfe453d9c74138df2fb10b5e3 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index eded0676dbe6f4378334a44da6c700a7e3468276..6a12e7faac1fb1710284e6de5aaef84de3e9a943 100644 (file)
@@ -16,8 +16,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
     jdk: "openjdk8"
index ae9c7a24e340d2de0f766475f6d6f428386d98ec..6cdaf1ef9fbabd4dc62621585337a79793451c8b 100644 (file)
     # 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:
index 6f5a927be4864dcf68187c66cbd0a295f422eeb7..7b3255a5901379d8f7a45c85fa25e402f7772866 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index f811cea4311419c68e5c9e25bfba6aa8a2e55795..26b3f5eb6d9c9728963d6fa3368713399089a874 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 481a146646e72cd76298b2effac9646713ee6bf1..87482709aa1ad7b309dd8d94fbbda903ea1326a4 100644 (file)
     # 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:
index 140f7872b228c9bf2d8985d4008a2cd98128e331..f271e09b590da23aa8395f1cfd523d322283e370 100644 (file)
 
     # 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
 
       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
     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,
       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
index 68e1038b8a1f294b644b4451e54330ddece012e6..9413a3ffd2945eb8e1eb5e2b0dfdb034d2ea1722 100644 (file)
     # 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:
index 870652eacd5da8fd4037415cdeeab20c6a42535e..867cd6c3334432d5fa80e3f55ef48774d90fde0c 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 230b17eed54ef3c7766240dbbf6e3d517efd84f4..e1fba2c64cf675f9926e4f2271e8ec8a825881d6 100644 (file)
     # 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:
index e24a45bfc4c64aee42de07e397766d9c69313bbd..feddf52e0c20e4642a6a9b0447e570c718144a66 100644 (file)
@@ -8,6 +8,4 @@
           branch: "master"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
     build-node: centos7-builder-2c-2g
index ed2bb9178b6af3798c7384230dccec4bad8210ba..b3f5877bc32d3b9e73368876b19378a2133dcfff 100644 (file)
@@ -12,8 +12,6 @@
           branch: "stable/aluminium"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
 
     project: docs
     project-name: docs
index f4df8dc32b27258bc4550f4a0a03f810e99d1f44..05e7b801762f01edb2b7ac57e82a2a9ef6aa8feb 100644 (file)
@@ -25,8 +25,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index b70baf3fe3ebe69a2b71a19220b0e549f36e6937..c4c539c48ddc74bcba34b9aa97bbe33320ae886d 100644 (file)
@@ -16,8 +16,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
 
index e86ee2c5c4b014f9af6cb70d8a928bad6dcff68b..0959fa964816dc3cff22700179fdc075b2ebeaa6 100644 (file)
     # 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:
index 2bb19cc5166dee3e1c35ef2f7ba84a8a6a9222cb..e5aea59abe08a0d8d5e2af9f81b605c1d7246a97 100644 (file)
     # 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:
index 14f6227c665d1667123af784dc9e0b479962d4e5..453383882dc7589b32cb2688ae58a77c6eaf2464 100644 (file)
@@ -16,8 +16,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
     jdk: "openjdk8"
index e960ea1910d994c298519d85a24f7737ce8e3e4a..bf679d201c0d6e1d4240de213ab8e532ca10c120 100644 (file)
     # 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 (file)
index 81a3406..0000000
+++ /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,
index 8427aaf683f60c365de3df8b2ccf72903a100629..11aa745939ae1ade54b9dbc483f0627754adbb5e 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 0fdb9d5593dc955b7f898afdc3c6e56fc4cb2ddd..dc75bac573c239843cfebdebfc32b6edf763b5ce 100644 (file)
           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
             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
           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
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
 - project:
     name: distribution-sonar
index 9c4f1e0231e7f2d346a8e5b9d30632a02b7721ed..034ec5a0ee5d2c32a6085ae2a7bc9ef42dea5ff1 100644 (file)
             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
           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
           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"
index a054e1fa042923cf6c92f0ab502fb09f6798b0ea..92cc1e1c3ddf88fe4fbdcc486c6a71288d7ee83d 100755 (executable)
@@ -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
-
index 498fc21ec6380cb7a7ca7f4192d5be4a90b454cd..dc29dc04f2571833d75c0cb15007c96ee9792916 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 603124372493913d3176e4c213207ae8a2f14a42..c1775f058dd1ed1bfe093851452451dd9e74e9f8 100644 (file)
     # 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:
index 55f97236ba648e2f4468d99aa5ccd36d8662da71..48fb783460d757f36b8a178b29475ded51beba0d 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index a1d2e1a9bc69a5dbd71914b199b7eb3c8bb7f7b9..5aada29120d21ec91f220ca47d368313a1f8ed3b 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 4b831f8a3499e7f21d66a6dcf115a058a4ceaa24..d977e998d9044bd3f758cc1f9e9cab2cdc9adea8 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 635bbf2b324f7aaa24711611812b30e3ff38eb70..83e39600fa93bf1d1f513b54c55eb4939a800c27 100644 (file)
@@ -19,8 +19,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
 
index 8e2b5f56d90c7e9c428b7f9712b33074cb4e7286..32a4ec7f89164144cdc26f0237c8a9ce7447662c 100644 (file)
     # 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:
     # 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:
index b706b2f5dad632cbf6288a86e4d07b2c3135204a..99f979c46137ef4b68c06404cd2564eff2df062e 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index ec9c685bab9bcaa41ba2a3a5ab9e44cb5cc10372..ebeadb63aa056a8424c838d6352eb1d1ee847da1 100644 (file)
     # 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:
index 87ab3d30bde5b18bd1342c44246cdfce0fb649ef..f35425af226b9eb69a74bfedab9d27c7902881a0 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 4cd6c3656dfbb6f1eb71f0eda3ef2015dc9db748..79cb62eb56103bb8d70a5e00030bb0e45664af66 100644 (file)
@@ -16,8 +16,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
 
index c8d25153946d0aa7fcd77504e60d3704fce2fb29..94a514799104a2589484a833815dd7639a9c5d1e 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 62f863c281a180787a76d3a30acafc822ec75843..827bc49d7810037363fd04394bb1af1a6831e5f9 100644 (file)
     # 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:
index d47eb711aa5782f28a91ffb7ee87faf54185591e..0c3e439e3e0090e5358921497c80509cfd3f0034 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 3e9a2e9d809dd6c2ca26430e12cffafc4dd12ccf..83b079bc5f63422b0db2d1afa0cd8cb4f62a5fcc 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index d7b85ab62eaeebffc2b6d9b920365e4d1ca3e9ae..350b8c74cefe6ec85b31fb1812fc91c1810722c7 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 6cb0c6e137dbb2e127acc07ca22e477f71740d97..ac880062c41a879af687071eef3493db949525a5 100644 (file)
@@ -16,8 +16,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
 
index d4cc0a468beb153ede5ab2b82814d121acb11f9e..75ae8c65641ed775ac1bca5d736a3c29b29a35c6 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
             "-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:
index c3ca4ad20d44d2670f076b6057d1a22e2b7c3d2c..79e53256f0c81813c52e795e2e2e67e5755bc0ab 100644 (file)
@@ -27,8 +27,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index eac56d0ea5c25bc8a7363d0b67a9e942746db343..278f8f3d033005791173f88b69a56cf1d5972f47 100644 (file)
     # 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:
index ee9823ac42551606446af71e8c5572b830d9161f..894e386ed9944a4ce8a1c543b7d110d992dc1b49 100644 (file)
           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}"
index 541bd6b4300313169bc19964de25ce014c439015..361635ddb82fa2e802419ae09286350357f5bf05 100644 (file)
@@ -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:
index b4262e3772e9ca58ab21038ef457bf61465d9b30..5d7124ddb8942bfdb01f26f5d9e260cda30a40e9 100644 (file)
           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:
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     topology:
       - 1node:
index 93151bf130ff98bc37b233aa5a6ae793475bbbc7..4530e8379904fa92919d9e58d937bdb7ef93e9de 100644 (file)
@@ -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}"
index 949f7d406f7319bf955892272cc3b47d423eb450..aecfca9a538539713f47e168b8687e187280d6c8 100644 (file)
@@ -16,8 +16,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "rocky"
 
index 3082deb687c42f2f883a93d0dcb823b6b3a564ee..69d950cdcd538e86d9de200b433481bbe2696f09 100644 (file)
     # 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:
index 95a762f823878fe2d12622d1c2c61cda1cfd476c..783fc8195d7d0e665759c319c0ce907fc2a51629 100644 (file)
@@ -13,8 +13,6 @@
           branch: "stable/aluminium"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
 
index 2986e88b0f27eb8406a3171357286a43747c16a9..82ae533cfeacbc05351b4efac82a805f30894a82 100644 (file)
     # 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:
index 83cf52c094f76cd25ef6cb850b3fe6f7e72dc0a7..a89a46509ab86aa19efc5e6f6368783ac8112952 100644 (file)
@@ -13,8 +13,6 @@
           branch: "stable/aluminium"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
 
index 2ae9bab6ad11af47aebb84abeebbfeb5a4592560..327ad08a08f6ac6d7958e75d4c17619a87e19b2b 100644 (file)
@@ -19,8 +19,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     functionality:
       - "upstream"
index 721535e2ad2fcbe401b4c135eb6c0d93ce6caa91..ea11a72002b5338bfa92d090bc514464205b1fed 100644 (file)
@@ -14,8 +14,6 @@
           branch: "stable/aluminium"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
 
     feature:
       - current:
index 00ae32addb2176d35b69ab452dd6be396f5086ee..7ba16eaba9f6b121a55cea66367c2068ea5ff03f 100644 (file)
@@ -17,8 +17,6 @@
           branch: "stable/aluminium"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
 
     project: odltools
     project-name: odltools
index 79f6bd8aa4b8391c8d47ef04d76c34a367f2d943..56b5fa56b6836ebf9d5d79d49e534a96f6812b03 100644 (file)
     # 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:
index c8ff159c22efe70779c65b510e32f7d0f62c14ec..94b31816148e7483749f03b594de32f9c82cd1ca 100644 (file)
@@ -19,8 +19,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 2871b5d4a003e8dc988aad730e3b430b4067c13e..6d4765428fc2f7c95bc30ddd86a91fd1100fef32 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 1ad7a9b2a38af4d5a0e79c02bccd9df3aec9b2ca..a616f29f7c186e69ea73d518d48df480f2ab64fd 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 46df54ef1bea2592bc553dad34a9a9f3004e9cf4..88904df9d852e36da92a23b2d0c92078138fec0c 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index a6106e251b5fc4a1ec1c7424c3ec80cc8f2902de..9795ad65e8da60e940ab2baeadc6dabd01dada92 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 93fc31a8f9bb264c939d42f1bf509f58ab1e238b..030f3664610ed08b3c7d4b6a69eaf385c7a16f66 100644 (file)
@@ -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"
index 5f08e6c7bcbbb4b0c5013dad7e236b69e0cea939..9e33a25acab81bfdeee8e53dee697ef6d841f92d 100644 (file)
@@ -25,8 +25,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 02d15d2a8a0f79ef432e5a20bfdb376280c45688..bdbfda79e933119d03f960b4e89faab2d6f05802 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 083e89f8d9b71edcc380e22f1a06123fe4344901..6df51d475cf025388a06b2b80b2486faa123bd14 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index c2c43c8cf054a428ce20408ee1bfcff37448f61f..2da69e2364c4a8ed7a2dac0dc622bda2b71c5fb8 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 39e57d72167ee08ecc0169362bdb9ea07c9e4ce5..c34720b00eecf629cf9e479f393eb33813b5877e 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 625824c5b38da0cdcf276cc0580698c3476bf964..3107b4fda4cea3f7ab2052b27fe604a918d6013e 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 952f572106d2a25055100eb60448a2d28a739572..f58feb16b3a88c9e780169b0f70f6aebb0eb3478 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 24d46a306ec768887a456ed17228e546e42cab5c..829abf6e05da4f27886148ba0d3586c4e3f17c27 100644 (file)
@@ -18,8 +18,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
     jdk: "openjdk8"
index ae67c19f6af2b2723b7aade09f2bc35dd4eaca0b..255010acfd390a6c72d6c63264b5abc3f4a0f2f3 100644 (file)
     # 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:
index 29a884499e3f27e8ebe7ccbf8d3b67a9b8d7dfee..d686683215ecaf81a4059120eac4a4d9ab6b3dc9 100644 (file)
           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"
index 8897ea969c664a3f8ead94704e59bae723e0df4e..f09d5a3f356b83d17d6b928863c1daff81036036 100644 (file)
           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"
index 6c0650931e9d6b307845e9d01b71b8bc7fea9a4c..aa65f175baaff73262878e4225ed786012067d86 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 79413cd4cdd99e651e31907d9d9bc528615e7e76..001b04c9838a86993e39b13a7898aabffe5a8cbc 100644 (file)
@@ -23,8 +23,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index e0b58d5a35a486b29647f96bc1a19f2deda92aa1..fdbe98a0cc4507609c852f0e5e2551580fc6f9b7 100644 (file)
@@ -13,8 +13,6 @@
           java-version: "openjdk11"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
 
     project: "ovsdb"
     archive-artifacts: "*.log"
index de9fba5ac2ead7d759bba0e4fc3bc652241e1ed5..dabb4fbbea13b5bd27b96d15e607950ea9d81c1c 100644 (file)
@@ -17,8 +17,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
     jdk: "openjdk8"
index b08de9f989825c7f81b4ca119670b505b4bdc7b3..5955558ba555a8cdbbe70cb54cb47b41bc8d001f 100644 (file)
     # 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:
index 2ba703392914c3d70a557052f1e82951add13101..c8832f824dc140c8e7be6c45f20392745b99bbf2 100644 (file)
     # 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:
index d41cc10d5ca6a97b99452f6e13cc679f314bf2de..090f53e52246150583da2cf177167a607e427ea8 100644 (file)
@@ -24,8 +24,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 4bac2f7ef3036b1f2ed27a8732bdf15198d53b9a..fa9744e3c5d08f561ed8a2de050b8fd20603f8f0 100644 (file)
     # 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:
index 11e3fe689656ee64c0c6d29c8a29e64508c9ee23..b435eab946890157707e311ff2cbe737a8bbf9a7 100644 (file)
@@ -13,8 +13,6 @@
           branch: "stable/aluminium"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
     jdk: "openjdk8"
index dd4642a3a6d09a9e0bfc52c015c64e79391eb62b..4926281f72a926a72567ddf60d22f7239b45cf9a 100644 (file)
     # 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:
index da86d76c741cbe1a5a8bc1c4dbaecb20dcee1252..50674360c1cd0637c25f46fcdd66557dbaac8925 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 7739822f6ab2dfe090c168a732c1a4812fa72b02..7a11c799ceaecaf0e3a81f0eadf92a03bd4bdd67 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 781f4b464593d0a554e302387236d4c74c5565fd..3ea6e59d6e2d7a4bb77ee681c3a831411c2ae78b 100644 (file)
@@ -18,8 +18,6 @@
       - magnesium:
           branch: "stable/magnesium"
           java-version: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
 
index bb6defdd35aa1d508f75186986f9fb2ebd32bf2f..e690bfd593fd952d153ee7e534c7be3143e89d12 100644 (file)
@@ -11,8 +11,6 @@
           branch: "stable/aluminium"
       - magnesium:
           branch: "stable/magnesium"
-      - sodium:
-          branch: "stable/sodium"
 
     project: "sfc"
     project-name: "sfc"
index 1862cf8fc05c47000d7fc7d0e7b796675623fa8b..a18958e0e36a89ec902e2699e6c11aa25293b07e 100644 (file)
     # 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:
index 62e66caf30f1cf39b0591ad9abbf134c5fc240ba..0f07d2e6f44851ca9764a42a152948e96a9003bd 100644 (file)
     # 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:
index 9093535473368bb655f3244c3f667b8e85a2c1a8..6025519f9fbc324cb47d44b75ae05921af09bbc4 100644 (file)
     # 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:
index b70b02be4e6dad856dfffabb4820339ce5a89c69..bfea4a45f2d925a597b79102a2ac4fd513d8db67 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index bb49ee440391fe0d781ba9e7bdaa4322ba69a536..2d1f803192723bce3b6bcf101695181a82f4861b 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 78a4e5db0a4fdf8568c20f66eadfe1b3f279ef70..89e24da5a31f3543456c63a4fea35ab627914bdc 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 987fe98dc828d371cb948ba26fe13a7b9e6d170b..22dae0ec771c56f75c7c337d3cacee9db1fa6dd2 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index b21489ea958bd601bbce2e9b6fab03699a7abd7c..08f5578aa570820fc8f121d51bac046fce5c2445 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index fa734f36a21e4c2611cf109048708b5c216bb3e1..9cb5c0de94368749e40db48019c022bd9d2613e8 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 874aae89b7e85988e3f5b53b9fd0d2e5cebd5f3d..1d2b79faa850b0a5f891c4ef1ceeb143c1e5629a 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 390ecdaf896d15e5b9e3f1dd08246f8bfc4fe3c8..d78ccf77eef9faa4d54464ebe7853277e75f979c 100644 (file)
     # 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:
index d9af85a8ab76c6cf7e01bba9217e8bb120307fa9..c0b2d39c98178d229b3fb3fecaf277409339a9ec 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 7ed6c8c94c7a3340efd0d1da8b256e1b2a71f473..ff87b8d8134a096fb1aeea4bd1c4bfe7924c8a64 100644 (file)
     # 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:
index 64b02a217ecfcb28e78f20890de64f98ad0ac02a..9e4f716494c7b5275769fc1626079341c1a35dec 100644 (file)
     # 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:
index 056ad3c76d653712c3cd803cd5fa18d7cc31f17d..ebbc588c8f3abb3d52f2324dd298d9ef4ae1c5d7 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 13d09c29bb1141564c8e3f7bf499d64ac6f43afa..982a932d915345d4cb8822df58e3deffb08b784e 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 6a0526c4452df81cd79ffa91bed0ab6286c876fe..160f68b0d2eec3d86d3c13d8dac890f13edbf816 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 41c1ea38cd848b0cf64380ed228c9e6ef985ffd0..5fe72bee60c09a1b38bf84b23213b530811c415b 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index b9092068d9a9548f3905111a063166eed757c4c2..c272649613222812e158d04d9278e9809ba3e907 100644 (file)
     # 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:
index 11afb82b815506323ad7703d0ab1f73f3fe3f5e6..fdd45ceefb667f8b471e173a83b36e351d93fafe 100644 (file)
     # 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:
index 4389bc77a629d79251743248a71e98b45f6216de..e77b1baa46fc8cd035d8e030c7e7ccfe0e02c12a 100644 (file)
@@ -22,8 +22,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
index 7a0bc0e3215bcfb4e19f4cf87edad29ee9535878..7b3f549e58719ec428c0659ff13eae6fcb24cf65 100644 (file)
     # 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:
index 4c5e0daacad03389778e261937ea21d69889fdff..92148be94824382edebca296ca614dd84eb65c03 100644 (file)
@@ -21,8 +21,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - only:
index 8ad69652eabdd22175ff99c6e3ffdd16f7f648d4..469af901e35378b1072793b178d84d6e9e26667a 100644 (file)
@@ -16,8 +16,6 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
 
     os-branch: "queens"
     jdk: "openjdk8"