Purge Magnesium jobs from builder 11/95611/1
authorAnil Belur <abelur@linuxfoundation.org>
Tue, 30 Mar 2021 23:29:57 +0000 (09:29 +1000)
committerAnil Belur <abelur@linuxfoundation.org>
Tue, 30 Mar 2021 23:29:57 +0000 (09:29 +1000)
With Silicon release, Magnesium is marked EOL.

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I93a20d35f732806e3993befd126a03ce0ea1e6bb

149 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/archetypes/archetypes.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/validate-autorelease-magnesium.yaml [deleted file]
jjb/autorelease/view-autorelease-magnesium.yaml [deleted file]
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/coe/coe.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml
jjb/controller/controller.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/detnet/detnet.yaml
jjb/dlux/dlux.yaml [deleted file]
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-projects.yaml
jjb/docs/docs-rtd.yaml
jjb/docs/docs-template.yaml
jjb/docs/docs_version_bump.sh
jjb/docs/docs_version_bump_projects.sh
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-magnesium.lst [deleted file]
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/integration-test-jobs.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal-csit-netty-replication.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 [deleted file]
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
scripts/cut-branch-jobs.py

index 0a771869fba28b5e4596e69174e269a73cd3f351..26e8409bf1823dbbf8adff90dd12524695a27481 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index c5156f1fded707151abf5c3560ca35f033288438..ccdc972b1fcd5ff937a1c2eb23cf2251de7191aa 100644 (file)
@@ -16,9 +16,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 
index b9746c3f564fc62bdde399542bcb44fc121981d6..f9d166cb452596e17f0abad08bcb2327a382dccb 100644 (file)
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
-- project:
-    name: aaa-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "aaa"
-    project-name: "aaa"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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-release-management
     jobs:
index 638748d451054167f3f38d564867bd9a4ca5c711..94a17c7de7cbb6f6aeaaa508f9a5e356e7833cea 100644 (file)
     # Used by the release job
     staging-profile-id: daa2b00117ed6
 
-- project:
-    name: alt-datastores-magnesium
-    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: magnesium
-    project: "alt-datastores"
-    project-name: "alt-datastores"
-    branch: "stable/magnesium"
-    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 f2e0cfc210dd64021a68d5ebf3e99075ffa6a8f3..9d6fa5ed77e9354b10a10ddf44aad6178bde944e 100644 (file)
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
-- project:
-    name: archetypes-magnesium
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "archetypes"
-    project-name: "archetypes"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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 65a4c9f741efc132d7e5b0ba585ce28be63285c9..1506a995bd2c491fa47ae6e739443acfb6ed4061 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           integration-test: aluminium
-      - magnesium:
-          branch: "stable/magnesium"
-          integration-test: magnesium
 
     project: releng/autorelease
     project-name: autorelease
index 531d52a93a3878c43fb40892ebe4be6994122305..f8959dd2e4ac3ad7adc5f29badfe437e54959045 100644 (file)
           name: RELEASE
           description: |
             Release to generate release notes for.
-            Eg. Magnesium-SR2, Silicon-SR1 ...
+            Eg. Aluminium-SR2, Silicon-SR1 ...
     scm:
       - lf-infra-gerrit-scm:
           git-url: "$GIT_URL/$GERRIT_PROJECT"
index 000aa2fe88454ecf341a5c748000183e4f6705e5..77ceb465934e9faf5ff2269c0ab223a337b2976c 100644 (file)
@@ -17,5 +17,3 @@
           branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
-      - magnesium:
-          branch: "stable/magnesium"
diff --git a/jjb/autorelease/validate-autorelease-magnesium.yaml b/jjb/autorelease/validate-autorelease-magnesium.yaml
deleted file mode 100644 (file)
index fa6e8bd..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
----
-# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
-- project:
-    name: autorelease-validate-magnesium
-    jobs:
-      - "{project-name}-validate-autorelease-{stream}"
-    stream: magnesium
-    branch: stable/magnesium
-    project-name:
-      - aaa:
-          project: aaa
-      - bgpcep:
-          project: bgpcep
-      - controller:
-          project: controller
-      - daexim:
-          project: daexim
-      - genius:
-          project: genius
-      - infrautils:
-          project: infrautils
-      - integration-distribution:
-          project: integration/distribution
-      - jsonrpc:
-          project: jsonrpc
-      - lispflowmapping:
-          project: lispflowmapping
-      - netconf:
-          project: netconf
-      - netvirt:
-          project: netvirt
-      - neutron:
-          project: neutron
-      - openflowplugin:
-          project: openflowplugin
-      - ovsdb:
-          project: ovsdb
-      - serviceutils:
-          project: serviceutils
diff --git a/jjb/autorelease/view-autorelease-magnesium.yaml b/jjb/autorelease/view-autorelease-magnesium.yaml
deleted file mode 100644 (file)
index 62ff1c2..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
----
-# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
-- releng_view: &releng_autorelease_view_common_magnesium
-    name: releng-view-autorelease-magnesium
-    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-Magnesium
-    description: "List of Magnesium Merge jobs for Autorelease"
-    job-name:
-      - "aaa-maven-merge-magnesium"
-      - "bgpcep-maven-merge-magnesium"
-      - "controller-maven-merge-magnesium"
-      - "daexim-maven-merge-magnesium"
-      - "genius-maven-merge-magnesium"
-      - "infrautils-maven-merge-magnesium"
-      - "integration/distribution-maven-merge-magnesium"
-      - "jsonrpc-maven-merge-magnesium"
-      - "lispflowmapping-maven-merge-magnesium"
-      - "netconf-maven-merge-magnesium"
-      - "netvirt-maven-merge-magnesium"
-      - "neutron-maven-merge-magnesium"
-      - "openflowplugin-maven-merge-magnesium"
-      - "ovsdb-maven-merge-magnesium"
-      - "serviceutils-maven-merge-magnesium"
-    <<: *releng_autorelease_view_common_magnesium
index 03f5e8120dee79ca379c8c8fccd4a86263371bf1..8ec2890c58109ab895b1eeeb440fafd3659ded54 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 7b08a561200c23797f81bf9325ad0de09c6b31a6..0933d9a714f6e365c1c85721a3a90c4f340de76d 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 4fba92afd48dd2da3ed27e24a2d07c7161774233..157b39c7539a6183994c4cf811b086b71e3e8b61 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index cf43d213e92527cec8721a09bdcd849cdd84d0be..b9f3a84ca6655f945d2e6848fc32d549725d1351 100644 (file)
@@ -24,9 +24,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index d46a5799ccc704b1c434b343e2b82931a4cd0bbe..acc6bb7916f5cea6b410777380674dc9a15c81fd 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 6495486cff3d979d7c04fee9495ad6062301f6f8..a4edec8f233ff95485a9ea95bec5349acc23169e 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 0e76879dd87afd77212f0e1770daafd6271dd788..c65065868a0b39ca8e083498773214ee020f35b8 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 6fb08d4604d65b7ecb9220ce5168ecc29f047ddb..ce3dcf20760421097545bda98377a634ecdf02e8 100644 (file)
@@ -18,9 +18,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     feature:
       - bgp:
index 62cafe18a52862d985149dd817aacc862b4eb467..61a16c9ff7e872f3dd79468525c8f7ba1c36507a 100644 (file)
     # Used by the release job
     staging-profile-id: 9427a05049030
 
-- project:
-    name: bgpcep-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "bgpcep"
-    project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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-release-management
     jobs:
index 946e7a12d6a3f8f526d2a55cae233f520b520c05..3e176a2a908c038caf3f2a435ec958a8a616935b 100644 (file)
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
-    verify-stream: "magnesium"
-    verify-branch: "stable/magnesium"
+    verify-stream: "aluminium"
+    verify-branch: "stable/aluminium"
     verify-karaf-version: "karaf4"
 
     install:
index a437c2a1529dd613aa7599cd2ad47d54f9d63d23..56a277086de5a3bb12ba123a9e149ef698d044f7 100644 (file)
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
-- project:
-    name: bier-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "bier"
-    project-name: "bier"
-    branch: "stable/magnesium"
-    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 f8e18bc1e425c27b44855d47124ee8cad987c7ca..1b9ba8efa8726ddeedd3e6402b4e135ac7f3b613 100644 (file)
     # Used by the release job
     staging-profile-id: 96c0be46aac33
 
-- project:
-    name: coe-magnesium
-    jobs:
-      - "{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-jdk11
-      - odl-maven-verify-jobs
-
-    project: "coe"
-    project-name: "coe"
-    stream: magnesium
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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 b2c926d62f6520d942862b6640e065346f3b707f..22da66b7347071a29928d66c69df74f36f5d48f9 100644 (file)
@@ -20,9 +20,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index d98ab332a38035459cec2aa4db2d4d7367527c36..b48edc3179436d111dbcc1f95588b02cfa399b78 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 70b4b7f0e14ec3efc2f19765b2c29f4175cbc947..1cb0cec64737a12c43ac073799695097f9321bc7 100644 (file)
@@ -24,9 +24,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 40587064e92ac65bd23edc42d15d6d6ba65b1711..697a4d539448f9977661900ba9a61f680e4a316e 100644 (file)
@@ -24,9 +24,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 46b6a29ccda926beb8561b6b0791f781dd305fa5..d844c6970ede9d5d2e5ca89ca9e19191bde8d586 100644 (file)
@@ -24,9 +24,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index bef44f11dd00f09550e8972c5bc097c9ccc8af54..5f304f04258b7050516066f1bd0cfd936b7c9867 100644 (file)
@@ -24,9 +24,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index de489b8e48c6a101b0560048eee90edfaeb3ff08..fb45b78326b6ac0a3978da37618923287cd11db5 100644 (file)
@@ -24,9 +24,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index fc3890e4c24afe8a4e5b2d34eb98f36939ec747f..e5ddddac8abd6f683e88f20866b81fd20e14f885 100644 (file)
@@ -24,9 +24,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 88a54f8ed32c874043b93738200b75cf9a000dc9..7b80ca4e340effa10d87d1d94653a747481c534d 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 7cad11d8954664e95c6703cb14bc2726cb8f985f..4a175a06470e99a1f0ca7921b4783b8dc7d802d1 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 9ab8573ae37bcdbe080964e7f5458f9d95fe503e..3457c15449a14a4b1c6fa27d939ac9d6e9d43f14 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 5a9c6228605895808b0848077e531e06b7196b07..aceec9f93ed3e20aefca2c0dcfdbaae6b85584f0 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 1fa23f4be498314fc41519122a53ee8513474472..7949cae6310b259183866a01ab960aef522e0d44 100644 (file)
@@ -16,9 +16,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 1d9e896356e504be60cd0ff2389d41dc05020ea2..6068ffb04b23461784956ae08e771c731601b868 100644 (file)
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
-- project:
-    name: controller-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "controller"
-    project-name: "controller"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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 ba58c6d391e4a2ac2a57c889557e07018c164126..8297973dbbfc142e12993487c0dacad59386781d 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index f442b3824d9e39d46ada3766b923b3d1dfb5529f..c6b84dd2af20ed7ae3d78d2ef44d6adf22dfeafe 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index a943672e92d40a5a15b6f394149596174585f043..1e22f4cfcb6700737bfe59f248e47bdab2ba651b 100644 (file)
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    project: "daexim"
-    project-name: "daexim"
-    stream: magnesium
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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 a90c876a62d79a0faea7898eb69337e24bedd5f2..a220f8d6f871a55150cd1760327badfe20abf4f5 100644 (file)
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/magnesium
+    verify-branch: stable/aluminium
     # Value for ODL_STREAM
-    verify-stream: magnesium
+    verify-stream: aluminium
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
       controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
       mdsal-csit-3node-netty-replicate-only-aluminium,
       yangtools-csit-1node-system-only-aluminium
-    csit-mri-list-magnesium: >
-      mdsal-csit-3node-netty-replicate-only-magnesium,
-      yangtools-csit-1node-system-only-magnesium
     csit-sanity-list-silicon: >
       openflowplugin-csit-1node-sanity-only-silicon,
       distribution-sanity-silicon
     csit-sanity-list-aluminium: >
       openflowplugin-csit-1node-sanity-only-aluminium,
       distribution-sanity-aluminium
-    csit-sanity-list-magnesium: >
-      openflowplugin-csit-1node-sanity-only-magnesium,
-      distribution-sanity-magnesium
     csit-weekly-list-silicon: >
       controller-csit-1node-notifications-longevity-only-silicon,
       controller-csit-3node-drb-partnheal-longevity-only-silicon,
       distribution-deploy-aluminium,
       distribution-offline-aluminium,
       openflowplugin-csit-1node-longevity-only-aluminium
-    csit-weekly-list-magnesium: >
-      controller-csit-1node-notifications-longevity-only-magnesium,
-      controller-csit-3node-drb-partnheal-longevity-only-magnesium,
-      controller-csit-3node-drb-precedence-longevity-only-magnesium,
-      controller-csit-3node-ddb-expl-lead-movement-longevity-only-magnesium,
-      bgpcep-csit-3node-bgpclustering-longevity-only-magnesium,
-      distribution-deploy-magnesium,
-      distribution-offline-magnesium,
-      openflowplugin-csit-1node-longevity-only-magnesium
     csit-mri-list-phosphorus: >
       controller-csit-1node-akka1-all-phosphorus,
       controller-csit-1node-benchmark-all-phosphorus,
index 1554246c471b1a58663c2189d8ecbb1fbd0ef706..1e0af1e58e8900821efe52a223910784a548ebfb 100644 (file)
     # Used by the release job
     staging-profile-id: 8981976d0fea7
 
-- project:
-    name: detnet-magnesium
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: detnet
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/
-          rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "detnet"
-    project-name: "detnet"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    mvn-settings: "detnet-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[detnet] [odlparent] [yangtools] [controller]"
-    build-node: centos7-docker-2c-8g
-
-    # Used by the release job
-    staging-profile-id: 8981976d0fea7
-
 - project:
     name: detnet-release-management
     jobs:
diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
deleted file mode 100644 (file)
index 9413a3f..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- project:
-    name: dlux-magnesium
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "dlux"
-    project-name: "dlux"
-    branch: "master"
-    java-version: "openjdk11"
-    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:
-      - gerrit-release-merge
-
-    project: dlux
-    project-name: dlux
-
-    build-node: centos7-builder-2c-1g
-    mvn-settings: dlux-settings
-
-- project:
-    name: dlux-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: "dlux"
-    project-name: "dlux"
-    branch: "master"
-    mvn-settings: "dlux-settings"
-    mvn-opts: "-Xmx1024m"
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-api-token: "{sonarcloud_api_token}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
-
-- project:
-    name: dlux-info
-    jobs:
-      - gerrit-info-yaml-verify
-    project: dlux
-    project-name: dlux
-    branch: master
-    build-node: centos7-builder-2c-1g
-
-- project:
-    name: dlux-view
-    views:
-      - project-view
-    project-name: dlux
index 127aa212c50e0dcfd15f0b9003d8665ac7779948..0050f6a4240485dda65324ea94ed9bd057dd6cf0 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index f82822e96812d8b175199034194457c712a00214..204b1e5be5a1c9bdb96ece00696eba721e791928 100644 (file)
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
-- project:
-    name: dluxapps-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: "dluxapps"
-    project-name: "dluxapps"
-    stream: magnesium
-    branch: "stable/magnesium"
-    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 feddf52e0c20e4642a6a9b0447e570c718144a66..ad87d0bac9a6a756090b4821afcd8fff0aaa898e 100644 (file)
@@ -1,11 +1,9 @@
 ---
 - project:
     name: docs-update-{stream}
+    build-node: centos7-builder-2c-2g
     jobs:
       - "docs-update-{stream}"
     stream:
       - master:
           branch: "master"
-      - magnesium:
-          branch: "stable/magnesium"
-    build-node: centos7-builder-2c-2g
index 98f57e5f5b2506e4201fe4a2116bcf5569a11432..b246d2cfc1ce759451347df39a5a04b4ec466480 100644 (file)
@@ -12,8 +12,6 @@
           branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
-      - magnesium:
-          branch: "stable/magnesium"
 
     project: docs
     project-name: docs
index c367eae10c546d7b7adbb3cecb165c96b00ad7f8..b700ec0ea70103b48ecec39db5f99ef541aa68d2 100644 (file)
@@ -29,7 +29,7 @@
           lftools-version: "{lftools-version}"
       - string:
           name: RELEASE_NAME
-          description: "The next release name eg Magnesium"
+          description: "The next release name eg: Aluminium, Silicon."
       - bool:
           name: PUBLISH
           default: false
index bf18ee194277e532b6740098c821497a1d115d77..50bc1c9e3e43411b54d66c682869ee1f87102f67 100644 (file)
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <RELEASE_NAME> <PUBLISH>"
     echo ""
-    echo "    RELEASE_NAME:  The RELEASE_NAME e.g Magnesium ."
+    echo "    RELEASE_NAME:  The RELEASE_NAME eg: Aluminium, Silicon."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }
@@ -103,4 +103,4 @@ else
             Should be $stable_release_str on ${GERRIT_BRANCH}."
             git review
     fi
-fi
\ No newline at end of file
+fi
index 6db45944a56b4bf5b1a9327ad429869e442cb55c..defda6d63112ec4290c05f43bb97e07a5462ce4c 100644 (file)
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <release_name> <PUBLISH>"
     echo ""
-    echo "    release_name:  The release_name e.g Magnesium ."
+    echo "    release_name:  The release_name e.g Aluminium, Silicon."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }
index 78b1f789b2707aa4d500240cea949365e9a4f71d..944cac455f3e6ff21a073025450c82ab0eb6a5d9 100644 (file)
@@ -25,9 +25,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 59c108fc3ca50ee0666874df4b14c8e28c2fc1d3..d1356e476b03d2aedbd43b95d549271bdfc54c26 100644 (file)
@@ -16,9 +16,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     os-branch: "rocky"
 
index e901919e9578cc4520e24a416966ca6db2d2cb90..45738c47b977de2a78273742b296940b597fb9f6 100644 (file)
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
-- project:
-    name: genius-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "genius"
-    project-name: "genius"
-    branch: "stable/magnesium"
-    build-node: centos7-builder-2c-8g
-    java-version: "openjdk11"
-    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 940ed771e63100ea2a0230eb2a67afbf4f5652c2..06a1cc5f9e0255ed53b6960997269fe1e89161f1 100644 (file)
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
-- project:
-    name: groupbasedpolicy-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "groupbasedpolicy"
-    project-name: "groupbasedpolicy"
-    branch: "stable/magnesium"
-    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 e3b4562063628cb35004b44bcd074cf8a006bac4..b459c7f0db9b35edea4b79bba920d93a0b630e73 100644 (file)
@@ -16,9 +16,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 98b2fb30e8b99b1cb43ce1a5a1573c12ee91fda0..5d9dece139d9596b7ba0895b8cb2f5a8f4a126d7 100644 (file)
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
-- project:
-    name: infrautils-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "infrautils"
-    project-name: "infrautils"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst
deleted file mode 100644 (file)
index 211ff12..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-aaa-csit-1node-authn-all-magnesium,
-bgpcep-csit-1node-bgp-ingest-all-magnesium,
-bgpcep-csit-1node-bgp-ingest-mixed-all-magnesium,
-bgpcep-csit-1node-throughpcep-all-magnesium,
-bgpcep-csit-1node-userfeatures-all-magnesium,
-controller-csit-1node-akka1-all-magnesium,
-controller-csit-1node-benchmark-all-magnesium,
-controller-csit-1node-rest-cars-perf-all-magnesium,
-controller-csit-3node-benchmark-all-magnesium,
-controller-csit-3node-clustering-ask-all-magnesium,
-controller-csit-3node-clustering-tell-all-magnesium,
-controller-csit-3node-rest-clust-cars-perf-ask-only-magnesium,
-controller-csit-3node-rest-clust-cars-perf-tell-only-magnesium,
-daexim-csit-1node-basic-only-magnesium,
-daexim-csit-3node-clustering-basic-only-magnesium,
-distribution-csit-1node-userfeatures-all-magnesium,
-distribution-csit-managed-magnesium,
-genius-csit-1node-upstream-only-magnesium,
-genius-csit-3node-upstream-only-magnesium,
-jsonrpc-csit-1node-basic-only-magnesium,
-lispflowmapping-csit-1node-msmr-all-magnesium,
-lispflowmapping-csit-3node-msmr-all-magnesium,
-netconf-csit-1node-callhome-only-magnesium,
-netconf-csit-1node-scale-max-devices-only-magnesium,
-netconf-csit-1node-scale-only-magnesium,
-netconf-csit-1node-userfeatures-all-magnesium,
-netconf-csit-1node-userfeatures-rfc8040-all-magnesium,
-netconf-csit-3node-clustering-only-magnesium,
-netconf-csit-3node-clustering-scale-only-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-magnesium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-magnesium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-magnesium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
-odltools-csit-1node-upstream-all-magnesium,
-openflowplugin-csit-1node-cbench-only-magnesium,
-openflowplugin-csit-1node-flow-services-all-magnesium,
-openflowplugin-csit-1node-perf-bulkomatic-only-magnesium,
-openflowplugin-csit-1node-perf-stats-collection-only-magnesium,
-openflowplugin-csit-1node-scale-link-only-magnesium,
-openflowplugin-csit-1node-scale-only-magnesium,
-openflowplugin-csit-1node-scale-switch-only-magnesium,
-openflowplugin-csit-3node-clustering-bulkomatic-only-magnesium,
-openflowplugin-csit-3node-clustering-only-magnesium,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-magnesium,
-ovsdb-csit-1node-upstream-southbound-all-magnesium,
-ovsdb-csit-3node-upstream-clustering-only-magnesium,
index 11aa745939ae1ade54b9dbc483f0627754adbb5e..459ccb73a0bc900b8777579afc37c3adfec0b31c 100644 (file)
@@ -18,9 +18,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 40d84f9695a471828ada4632bbd573267afefd3b..e224aca9c4d6587353b3b89693640d91392835cc 100644 (file)
           java-version: openjdk11
           jre: "openjdk11"
           karaf-version: odl
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: openjdk11
-          jre: "openjdk11"
-          karaf-version: odl
 
 - project:
     name: distribution-managed
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
-          jre: "openjdk11"
-          dependencies: >
-            aaa-maven-merge-{stream},
-            bgpcep-maven-merge-{stream},
-            controller-maven-merge-{stream},
-            daexim-maven-merge-{stream},
-            genius-maven-merge-{stream},
-            infrautils-maven-merge-{stream},
-            jsonrpc-maven-merge-{stream},
-            lispflowmapping-maven-merge-{stream},
-            netconf-maven-merge-{stream},
-            netvirt-maven-merge-{stream}
-            neutron-maven-merge-{stream},
-            openflowplugin-maven-merge-{stream},
-            ovsdb-maven-merge-{stream},
-            serviceutils-maven-merge-{stream},
 
 - project:
     name: distribution-full
           karaf-version: odl
           dependencies: >
             distribution-merge-managed-{stream},
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
-          karaf-version: odl
-          dependencies: >
-            distribution-merge-managed-{stream},
 
 - project:
     name: distribution-release
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
 - project:
     name: distribution-sonar
index 96389f490b1481e3a294fc4a749448854e5164f6..72d749bdcdc049488c4993c9a578792a1cff6c6d 100644 (file)
             daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
             bgpcep integration/distribution
 
-      - magnesium:
-          branch: "stable/magnesium"
-          mvn-version: "mvn35"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-magnesium.lst
-          build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
-            bgpcep integration/distribution
-
 - project:
     name: integration-distribution
     project: integration/test
           csit-list: !include: csit-jobs-aluminium.lst
           csit-mri-list: "{csit-mri-list-aluminium}"
           csit-weekly-list: "{csit-weekly-list-aluminium}"
-      - magnesium:
-          branch: "stable/magnesium"
-          csit-blocklist: >
-            alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
-            p4plugin packetcable sfc 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-magnesium.lst
-          csit-mri-list: "{csit-mri-list-magnesium}"
-          csit-weekly-list: "{csit-weekly-list-magnesium}"
 
 - project:
     name: integration-sanity
           branch: "stable/aluminium"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-aluminium}"
-      - magnesium:
-          branch: "stable/magnesium"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-magnesium}"
 
 - job-template:
     name: "integration-merge-dashboard"
index 504c1dcb2c3b1a9cf76c3f02b32f408bace4d649..b494f0d131728ddbec5f41b232266d438295c852 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 2d193a1c500bf39f391133cbae50198a1a2ecd89..11ba9beaf0eb615d5e8fbf330160f04672512e71 100644 (file)
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-magnesium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{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-jdk11
-      - odl-maven-verify-jobs
-
-    project: "jsonrpc"
-    project-name: "jsonrpc"
-    stream: magnesium
-    java-version: "openjdk11"
-    branch: "stable/magnesium"
-    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 e389d7988ca8fb22d45f6f52dd6a2730ee239e7a..f68f89b84953f535bbdbd05501253f1db693c664 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index f5fd4757f030443110937add811e0bf9745d7088..b0a9d4f8a24b80e15d3c2ee0157540a82e5832d9 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 0d9a365e1fe77983dfe4dae09b36b1cf542ae2f9..58003f09b7e39b39ade56134c2e6c922934824af 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 54d8399d84fa036d8b55a17c65876ff3dd34f918..fa7e6d74b3bb6d792fbe549698105aa56161737e 100644 (file)
@@ -19,9 +19,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     os-branch: "queens"
 
index 23f6beaecb8c147c608ce6ee289d90539ab2f74f..758837e1224edfce789d0f1bcc5e936370bce439 100644 (file)
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
-- project:
-    name: l2switch-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "l2switch"
-    project-name: "l2switch"
-    branch: "stable/magnesium"
-    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 d5c7d181965806dc42b4b4fd3838ab088a0066f1..35c5ce585336d7c2eb71021873b1f7d6c5543523 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 25598d58fdd437eed00b627428d4f68a74149e5d..6d36a960246949041f103f88b3017a6dfe150d6d 100644 (file)
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "lispflowmapping"
-    project-name: "lispflowmapping"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    mvn-settings: "lispflowmapping-settings"
-    mvn-goals: "clean deploy -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 c5ed3ba394d89332247eaac5f23e4f7ed5a6f311..54f92b6544889718d7eba555caeffcdca698bc1d 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index bedb8fba56691fe6270d2a5f4a89ae4d2cf995b2..6e6eb6e1d64a596e2ecc66907ad1060578b89946 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 8c5096c919ac78da0f809e2f607cd2961bf36ee6..49838f97e270eb1a1ade27cb107948df4b5fc23e 100644 (file)
@@ -16,9 +16,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 
index f5117303f6b41b2cf9a00a6637c2ff089419c53b..6195648a3f054ee4c1e2b4f7a9f49e27d43246db 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 210a975ad2ec05c3ea1414f171e43cad824fed7b..e2a3e38a870ffe5cc4104da0214e60c8e1fe7de7 100644 (file)
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
-- project:
-    name: nemo-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "nemo"
-    project-name: "nemo"
-    branch: "stable/magnesium"
-    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 03083928fc0909a0a62f95544d326df655178548..f73b589f3229efd74d54118cdfb82fd225258283 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 4119d427f45add37acd8197680a86b1ae2e98ce4..5efea41d877f23deccbb5724dbfaa2e7d107ba02 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 2b6d9dea2a0db084a59fa03f4dca8b112922aabd..4896fcf8d4dfc3afbe7ee36012159c179a616831 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 3827b619160d7743e224464fd12ccb59f2dd77a4..141da5e1c9f46dd16a551ac53a7bbd545ebc5db3 100644 (file)
@@ -16,9 +16,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 
index 94532319e7e0d08d6769ffe400a10b5e8a0924a4..45f3b9487543c5ea65d8aba7b9f5586d021706b7 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
             \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:4000 -v DEVICE_INCREMENT:500\
             \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-          robot-options:
-            "-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*"
 
     install:
       - only:
index ec9e174c7e8566ea9f674ccbf9179d9f4fb7a2b5..b0c3c1eaf7df4a22958bb7b43110e60fd6994b41 100644 (file)
@@ -27,9 +27,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 0c18d9da18bb6c95ff669510df6eabbc19dfc9bb..a41ee0f643d15bab9998792b3d1767f97e90bf0c 100644 (file)
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
-- project:
-    name: netconf-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "netconf"
-    project-name: "netconf"
-    branch: "stable/magnesium"
-    build-node: centos7-builder-2c-8g
-    java-version: "openjdk11"
-    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-1.7.4.x
     jobs:
index 5b3b2a2e4430de53acfda8a8861906e48cce7ec3..508fc27a3ed2fca28c05439ae2830285165cbe36 100644 (file)
           odl-ml2-port-binding: "pseudo-agentdb-binding"
           openstack_system_image: "{openstack_stein_system_image}"
           openstack_system2_image: "{openstack_stein_system_image}"
-
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-magnesium-stein
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: "netvirt"
-    stream: "magnesium"
-    branch: "stable/magnesium"
-    jre: "openjdk11"
-    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: v3-standard-2
-    openstack_system_flavor: v3-standard-8
-    openstack_system2_flavor: v3-standard-4
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200813-034124.624
-    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:
-      - stein:
-          openstack-branch: "stable/stein"
-          odl-ml2-branch: "stable/stein"
-          odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_stein_system_image}"
-          openstack_system2_image: "{openstack_stein_system_image}"
-          schedule: "{schedule-weekly}"
index 83b4f6d524c7527f29a0ff8431ed25fd1b58a7b5..23af285fadce2ffc68cb274d1c8398f5a026a6eb 100644 (file)
@@ -54,9 +54,6 @@
     project: "netvirt"
 
     stream:
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
index fcea3919190adf457d16ebdddfcbf55864cb2e84..f61e372df4f31250a387aa9d73cd8614df00594e 100644 (file)
           openstack_system_image: "{openstack_stein_system_image}"
           openstack_system2_image: "{openstack_stein_system_image}"
 
-- project:
-    name: netvirt-csit-openstack-integration-magnesium-stein
-    jobs:
-      - inttest-csit-openstack-custom
-
-    #temporarily disabling Stein jobs
-    disable-job: true
-    project: "netvirt"
-    stream: "magnesium"
-    branch: "stable/magnesium"
-    jre: "openjdk11"
-    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"
-          tools_system_count: 3
-          schedule: "{schedule-weekly}"
-          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-daily}"
-      - tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
-      - gate-tempest-stateful:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-      - gate-tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-
-    openstack:
-      - stein:
-          openstack-branch: "stable/stein"
-          odl-ml2-branch: "stable/stein"
-          odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_stein_system_image}"
-          openstack_system2_image: "{openstack_stein_system_image}"
-
-- project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-rocky
-    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:
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-
-    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:
-      - 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-stein
-    jobs:
-      - inttest-csit-openstack-custom
-
-    #temporarily disabling Stein jobs
-    disable-job: true
-    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:
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-
-    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:
-      - stein:
-          openstack-branch: "stable/stein"
-          odl-ml2-branch: "stable/stein"
-          odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_stein_system_image}"
-          openstack_system2_image: "{openstack_stein_system_image}"
-
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-silicon
     jobs:
diff --git a/jjb/netvirt/netvirt-job-reports.yaml b/jjb/netvirt/netvirt-job-reports.yaml
deleted file mode 100644 (file)
index 4530e83..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: netvirt-job-reports
-    project: netvirt
-    jobs:
-      - netvirt-job-reports
-    report-jobnames: >
-      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"
-
-- job-template:
-    name: "{prefix}netvirt-job-reports"
-    id: netvirt-job-reports
-    node: centos7-builder-2c-2g
-    project-type: freestyle
-    disabled: false
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: "{build-days-to-keep}"
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: "{os-cloud}"
-          project: "{project}"
-          branch: "{branch}"
-          refspec: "refs/heads/{branch}"
-          artifacts: "{archive-artifacts}"
-      - string:
-          name: JOB_NAMES
-          default: "{report-jobnames}"
-          description: |
-            Space separated list of job names to process. Example:
-            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}"
-          description: "Logs url"
-      - string:
-          name: NUM_JOBS
-          default: "{report-numjobs}"
-          description: "Number of jobs to process"
-      - string:
-          name: REPORT_PATH
-          default: "{report-path}"
-          description: "Output path to write files"
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: "{build-timeout}"
-
-    builders:
-      - run-job-reports
-
-    triggers:
-      - timed: "@daily"
-
-    publishers:
-      - lf-infra-publish
-
-- builder:
-    name: run-job-reports
-    builders:
-      - shell: !include-raw-escape:
-          - run-reports.sh
index f237dd89bc4303800d636013f268c8ffc0a75a67..9a5f57dd61fb31c77611b0ee5cc744c0683a5d46 100644 (file)
@@ -16,9 +16,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     os-branch: "rocky"
 
index 056fbac0150e2197ba9ddba1732d7a596970b0b0..ad45dc4713e1a60f59a157554a39c6064bd9ccd9 100644 (file)
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
-- project:
-    name: netvirt-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    branch: "stable/magnesium"
-
-    project: "netvirt"
-    project-name: "netvirt"
-
-    java-version: "openjdk11"
-    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 6c3f0f443d89544d33357c44cfea3a87fc886973..d4de8d2b8cac4fb1789ea9f27cf766d07b3b56ce 100644 (file)
@@ -13,8 +13,6 @@
           branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
-      - magnesium:
-          branch: "stable/magnesium"
 
     os-branch: "queens"
 
index 0e95f91d9d7add911f96965af10ba9e6438d5cce..9c80a472e7de93d3e684c80fa724b5060ef0aabb 100644 (file)
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
-- project:
-    name: neutron-magnesium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "neutron"
-    project-name: "neutron"
-    build-timeout: 90
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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 d965488c552572c244543194188a56eede736905..8939180cc0e1633729fcd08993702f3b99ae9a27 100644 (file)
@@ -13,8 +13,6 @@
           branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
-      - magnesium:
-          branch: "stable/magnesium"
 
     os-branch: "queens"
 
index f25fa3295a05d5401e94e05f6e3e2cfa7d3b4386..23a14691a541fe8f8c3a1eeec2cbe3e9eb44cf1a 100644 (file)
@@ -19,9 +19,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     functionality:
       - "upstream"
index 169fedf3fd92f09d01cc096def31b2c84eaa2954..9a813510a05268ea597750f8ee7b51b3dfe86550 100644 (file)
@@ -14,8 +14,6 @@
           branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
-      - magnesium:
-          branch: "stable/magnesium"
 
     feature:
       - current:
index 7ba16eaba9f6b121a55cea66367c2068ea5ff03f..83c30e9196fc57ead67e82cc77f11e23ccc70bcb 100644 (file)
@@ -15,8 +15,6 @@
           branch: "master"
       - aluminium:
           branch: "stable/aluminium"
-      - magnesium:
-          branch: "stable/magnesium"
 
     project: odltools
     project-name: odltools
index ca574c2aac7155de453f958fa72248e7b12fe8b8..3c1ae18707788b9afb98a2023830907b9257a9e4 100644 (file)
     # Used by the release job
     staging-profile-id: a6880455efe67
 
-- project:
-    name: of-config-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "of-config"
-    project-name: "of-config"
-    branch: "stable/magnesium"
-    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 15beb0293ebbb8a7598e980e98c6469e91d5c71a..638377d815a20e57d12bf1b1d4ff67a09863ae2f 100644 (file)
@@ -19,9 +19,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 2cc2833712fb41926258f2c691a531510b90ea01..4ab1ba2cf6806e022d9a6fe2ae8c3e854ed77f95 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 75aa05d30b6aef69dcb7e39b28c5af7181121b7c..bd55d1b628bd7c27d423b1024bec6d174b531f60 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 5b8f2e2cbc1e52ed2688338f35de0239796a5b6c..8162bea49e983faaaf0b7894c34cf65907e00d75 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index b311c682f8c70d6826dfbabd3fbcdc76ed7c5ecd..8cc7e99e890c3b6913748c28dbab0e27cd3b5e7d 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 14d96f180d244e2f3a3bc04213ad460180e8f367..ae9e3cf8fe64e00c98b8615393809480bb618043 100644 (file)
           branch: "stable/aluminium"
           jre: "openjdk11"
           install: "all"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-          install: "all"
 
     # Job images
     tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
index 752e0c0c04b232b64fa40118bdac5722a7cbfbef..ecf1013872a0bd6084afb9905b1d3f78190cc435 100644 (file)
@@ -25,9 +25,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 0daba874354e1edf8d50e1b58a7c62d02271bdce..7e181e686664431acc57b37f040af7dc21f14fbe 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 9fab2adcd35df8a7cde917b6696953fd8838c236..fc72ecab1709957c8a14ee4cb6c4a8fb350ab244 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 08a79bbc128f5ee7c57899b29d2ca1fea99f1fbe..d88cad107fb468714f473ad46307a1336f0beb63 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 297eca372b14a9853b008479df5566a00a87a50c..7a112bf964a4c22a69c448f50e86907e2bc2758a 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 9b8613c9a99615f32ad860e056167c4abe131d63..2c34ba4daa0714b2ee1d4726489025203b5ba3ec 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index df11aec17a0739b3af96339ff7a186fafd2115b7..76b448d0cbc64b4007da6dcedbf43eb15c1942ad 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index fb7b69847e3a2e4b81aa21fe1a9721e29a1fdfe3..216d021108482789ef641b1b943988bbe47cb99c 100644 (file)
@@ -18,9 +18,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 4b2667902181b9720e13fe57b135f1cffa8b5069..a12acc733d83a4a9cae8ab94a25e962f08be70fc 100644 (file)
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "openflowplugin"
-    project-name: "openflowplugin"
-    branch: "stable/magnesium"
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    java-version: "openjdk11"
-    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 6977b77b937d383d2d00998ca3faf006dadd6b7c..8ab70dab582aed6af352ff0a552e4c1d304a7c23 100644 (file)
           libuv-version: "1.20.2"
           rapidjson-version: "1.1.0"
           openvswitch-version: "2.12.0"
-      - magnesium:
-          branch: "stable/magnesium"
-          libuv-version: "1.20.2"
-          rapidjson-version: "1.1.0"
-          openvswitch-version: "2.12.0"
 
     project: "opflex"
     archive-artifacts: "**/*.tar.gz"
index f09d5a3f356b83d17d6b928863c1daff81036036..7005227de05bcde7e02f9a6223c72a7c1ab41a12 100644 (file)
           libuv-version: "1.20.2"
           rapidjson-version: "1.1.0"
           openvswitch-version: "2.12.0"
-      - magnesium:
-          branch: "stable/magnesium"
-          libuv-version: "1.20.2"
-          rapidjson-version: "1.1.0"
-          openvswitch-version: "2.12.0"
 
     project: "opflex"
     project-name: "opflex"
index 428ddbe1c0f52e008477c0e817f37cb3e094abd6..d1a6f8f48b4333feba546bc025b2da5ec15757c4 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 9f35a9ac31b3cb737f4e667944d3ec1045f428be..fcd1b5c425e987687d61432c69b4c0f015ea6c2b 100644 (file)
@@ -23,9 +23,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 04a0ea1b87cbae2b3c0920d624af248cf2524df9..972f0418f1fbdf53dfad5478c9f95f88aba39962 100644 (file)
@@ -14,8 +14,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
 
     project: "ovsdb"
     archive-artifacts: "*.log"
index 0b0a0072ab4ff43b56433525801f894e9f3501a3..493978ac2df0de81cf9bcc2342fbff3ce4d5885f 100644 (file)
@@ -17,9 +17,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"
index ca2647613d3d46d2424fb4ece99c24a5b7df3ea1..204857223c9a247cb771c45cdb8c38551a2e4c21 100644 (file)
     # Used by the release job
     staging-profile-id: a68b188166958
 
-- project:
-    name: ovsdb-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "ovsdb"
-    project-name: "ovsdb"
-    branch: "stable/magnesium"
-    build-node: centos7-builder-2c-8g
-    java-version: "openjdk11"
-    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 69d3e9e1ded3c34bacffeea58c5daf9b9a11179a..b2ea5b1b5007a0f8943d73dac5398c27c4082f60 100644 (file)
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
-- project:
-    name: p4plugin-magnesium
-    jobs:
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "p4plugin"
-    project-name: "p4plugin"
-    branch: "stable/magnesium"
-    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 b39ec57f195fd1e4df69f1ecc79dbb82caa51329..80f33cc74e2782b8ae49fd9a244f0be21cab41ff 100644 (file)
@@ -24,9 +24,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index f67129aefd8e930bb53e1c7f11e0d2af5602784d..5b97889ccb6b9d1c2c8e18049a0e816b31e74078 100644 (file)
     # Used by the release job
     staging-profile-id: a68ca4a24655c
 
-- project:
-    name: packetcable-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "packetcable"
-    project-name: "packetcable"
-    branch: "stable/magnesium"
-    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 aa2e7fa022e9bc355f80d8210cdd0d974aad8f00..a38df8164ce3dc77d2fd5d33c5ee4927d0762449 100644 (file)
@@ -13,8 +13,6 @@
           branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
-      - magnesium:
-          branch: "stable/magnesium"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 9a9656900b6c0d2aaf6897584393ba9a1c2be92e..37154b12ae13421a1a14a676e40cdba5cb8ee4b4 100644 (file)
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
-- project:
-    name: serviceutils-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    branch: "stable/magnesium"
-    stream: magnesium
-
-    project: "serviceutils"
-    project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
-    java-version: "openjdk11"
-    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 810c901ac4af2e9ccfb174856ea1643ecf7e7f70..23928673853babc348b493d8eadf859519aed2ed 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 1dc97267ead4aa1d28c8cdd4fb31e3c3d987554d..33b75416016914302ee403f3ffb004a77d5b042b 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 0f67df687ad59f1eb166ff6164bd8fdd38d516cd..49efcec84df8856a7bec772b381beca969c55800 100644 (file)
@@ -18,9 +18,6 @@
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 
index 1bd4f5d99839a9bec2be7d81dcc1dc9e66402d42..6912502be81659f98fb7725795afebf8679de950 100644 (file)
@@ -11,8 +11,6 @@
           branch: "stable/silicon"
       - aluminium:
           branch: "stable/aluminium"
-      - magnesium:
-          branch: "stable/magnesium"
 
     project: "sfc"
     project-name: "sfc"
index a02fee1db2a1971394f85922ab440e509db4c992..67e2faa1b22566842e9ab8344d140e52f2a51fc7 100644 (file)
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
-- project:
-    name: sfc-magnesium
-    jobs:
-      - "{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-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "sfc"
-    project-name: "sfc"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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 31bf3eb5a175b28cb408293adeda2405901b446c..62d77a1e444927ac7da14dc37a2c400451f4c34c 100644 (file)
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
-- project:
-    name: snmp-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "snmp"
-    project-name: "snmp"
-    branch: "stable/magnesium"
-    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 7fb6aa10abb9c2481627206b27e2841f2af41543..d579f56c2117ddb7deba085943766e957a0833b8 100644 (file)
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
-- project:
-    name: snmp4sdn-magnesium
-    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: magnesium
-    project: "snmp4sdn"
-    project-name: "snmp4sdn"
-    branch: "stable/magnesium"
-    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 1370cb42c1f717bea283a86909da46d4df823323..c49b9c9ab3c8322144b992cf2430d343cb72760f 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 4f206daadc3c401640d0a0344ee2e6a4465722ca..fc1ddf4e0f9b728f0d1bdfb892ee45e2791860de 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 000e42a35707d36970b31dc151e1d50bbde2519e..6b6e7cab8192a6185f35419a3da491de33ca38c5 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index f9abe90f4e96ce42c1bcd7ec03464bcd11cec5f1..3d01a6f79383b9f07ad7692fb6df405327f838dd 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index f75dff42ed6b3eb283e341fa157fc62c8ebb32e4..2b932a3479d3334db501a6c61254d76ab5b4e9af 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index ce1a338225392b431c610d73106b51df0a80769c..a981c15255b96ea06982eef026ed5b6f27cd0ead 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index cd52b424838e23bab581bf175a63ca5ba5814e36..2190c0fc42854cdea05fb1df8fe7fe182b3ad2de 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 06a2efa0b0242763053a5233fcc5cc1fb641b6c9..1221bf20d4ffca3e124589a0fc5cd2bd191ce293 100644 (file)
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
-- project:
-    name: sxp-magnesium
-    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: "openjdk11"
-
-    stream: magnesium
-    project: "sxp"
-    project-name: "sxp"
-    branch: "stable/magnesium"
-
-    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 f6f8c7ffabcb237a02bd8809f360cdcba63e370d..f2ed3281409006a1de38557f0de9ea1bbe68fafd 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 71f7217741871906b044f13e05f11df8f3720814..8a4f4604c904a33fe4f7f3e13a9380b8e716c67d 100644 (file)
     # Used by the release job
     staging-profile-id: 8ed9c52266504
 
-- project:
-    name: telemetry-magnesium
-    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: magnesium
-    project: "telemetry"
-    project-name: "telemetry"
-    branch: "stable/magnesium"
-    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 6cf989e5ae9039aca948119819f10a9e8f9a4b01..0c1e5346cc5dd6cd44eae759ffa1cfb8e12e19d0 100644 (file)
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    project: "transportpce"
-    project-name: "transportpce"
-    stream: magnesium
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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 e6d3cd949800f2a1cad34af77d21a297aff681f3..5e7f431545ddf32b37b8608dd8f87b6b03254142 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index b1fb21a92046792f35928847b3d8027f1ff7e3e0..3acb1c70a29d2acd5fe378a0a36be35c8ae75246 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 4c7d127e91022c1a171d15714953d1094821a7d9..1ae40ec2c8b5035c02a49839a87b13f72110f87b 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 33d2f60ac77b779e28f638eb8fb4f6894c997fe5..f670686be17859ef8394650025f02aeec7b02f42 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index cb45be8965d5b1869299b901841e87acdba56d07..dc33285249b9626d4d6e326c3cda8ae9a4bd8599 100644 (file)
     # Used by the release job
     staging-profile-id: a69373036303c
 
-- project:
-    name: tsdr-magnesium
-    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: magnesium
-    project: "tsdr"
-    project-name: "tsdr"
-    branch: "stable/magnesium"
-    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 dabac9d4c53dedaea066fbd71b07c07f22c06212..c762c7aa6487d70ee8d626be1629bf8f77005cc6 100644 (file)
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
-- project:
-    name: unimgr-magnesium
-    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: magnesium
-    project: "unimgr"
-    project-name: "unimgr"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    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 b0fa5de3c604b018244ec0c58a90d1da120dbb8d..08114e284ed64c4beea12ddd61157df00a354792 100644 (file)
@@ -22,9 +22,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
index 116decf255569e1ca09528e89712ef5f42d68a9a..5360a15d9f889e91d69bf23e8141d928251ee84f 100644 (file)
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
-- project:
-    name: usc-magnesium
-    jobs:
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "usc"
-    project-name: "usc"
-    branch: "stable/magnesium"
-    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 9905290fdbed88c5af80e232d8d003330701d35a..40e9ceda7c176aa347f73aa466c17f81b22d894e 100644 (file)
@@ -21,9 +21,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - only:
index 9957520e334bee9d588c20470a7e0a815f4ec56c..70b9e75192f45c687d4731571a67cd3fa2c99434 100644 (file)
@@ -16,9 +16,6 @@
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 29cb121f3ba77b6b1b9d851237957fe5660bdb7a..a1c813ae57a208819d50489663fc6acce1a43550 100755 (executable)
@@ -346,7 +346,7 @@ parser.add_argument(
     metavar="RELEASE_ON_CURRENT_BRANCH",
     type=str,
     help="""The ODL release codename for the new {}
-        (eg. Magnesium, Aluminium, Silicon).""".format(
+        (eg. Aluminium, Silicon).""".format(
         default_branch
     ),
 )