From aaa15bfead052d8c3b2db95ff19b2d3d602c0d2d Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 31 Mar 2021 09:29:57 +1000 Subject: [PATCH] Purge Magnesium jobs from builder With Silicon release, Magnesium is marked EOL. Signed-off-by: Anil Belur Change-Id: I93a20d35f732806e3993befd126a03ce0ea1e6bb --- jjb/aaa/aaa-csit-authn.yaml | 3 - jjb/aaa/aaa-patch-test.yaml | 3 - jjb/aaa/aaa.yaml | 25 -- jjb/alt-datastores/alt-datastores.yaml | 24 -- jjb/archetypes/archetypes.yaml | 18 -- jjb/autorelease/autorelease-projects.yaml | 3 - jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 - .../validate-autorelease-magnesium.yaml | 39 --- .../view-autorelease-magnesium.yaml | 40 --- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 3 - jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 3 - jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 3 - .../bgpcep-csit-bgpclustering-longevity.yaml | 3 - jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 3 - jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 3 - jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 3 - jjb/bgpcep/bgpcep-patch-test.yaml | 3 - jjb/bgpcep/bgpcep.yaml | 32 --- jjb/bier/bier-csit-basic.yaml | 7 +- jjb/bier/bier.yaml | 21 -- jjb/coe/coe.yaml | 25 -- jjb/controller/controller-csit-akka1.yaml | 3 - .../controller-csit-clustering.yaml | 3 - .../controller-csit-cs-chasing-leader.yaml | 3 - .../controller-csit-cs-partnheal.yaml | 3 - ...ontroller-csit-ddb-expl-lead-movement.yaml | 3 - .../controller-csit-dnb-noloss.yaml | 3 - .../controller-csit-drb-partnheal.yaml | 3 - .../controller-csit-drb-precedence.yaml | 3 - .../controller-csit-dsbenchmark-cluster.yaml | 3 - .../controller-csit-dsbenchmark.yaml | 3 - .../controller-csit-rest-cars-perf.yaml | 3 - .../controller-csit-rest-clust-cars-perf.yaml | 3 - jjb/controller/controller-patch-test.yaml | 3 - jjb/controller/controller.yaml | 28 -- jjb/daexim/daexim-csit-basic.yaml | 3 - jjb/daexim/daexim-csit-clustering-basic.yaml | 3 - jjb/daexim/daexim.yaml | 25 -- jjb/defaults.yaml | 19 +- jjb/detnet/detnet.yaml | 25 -- jjb/dlux/dlux.yaml | 58 ---- jjb/dluxapps/dluxapps-csit-yangman.yaml | 3 - jjb/dluxapps/dluxapps.yaml | 20 -- jjb/docs/docs-projects.yaml | 4 +- jjb/docs/docs-rtd.yaml | 2 - jjb/docs/docs-template.yaml | 2 +- jjb/docs/docs_version_bump.sh | 4 +- jjb/docs/docs_version_bump_projects.sh | 2 +- jjb/genius/genius-csit-genius.yaml | 3 - jjb/genius/genius-patch-test.yaml | 3 - jjb/genius/genius.yaml | 35 --- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 29 -- jjb/infrautils/infrautils-patch-test.yaml | 3 - jjb/infrautils/infrautils.yaml | 27 -- jjb/integration/csit-jobs-magnesium.lst | 60 ----- .../distribution-csit-userfeatures.yaml | 3 - .../distribution/distribution-jobs.yaml | 33 --- jjb/integration/integration-test-jobs.yaml | 30 --- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 3 - jjb/jsonrpc/jsonrpc.yaml | 25 -- .../l2switch-csit-host-scalability-daily.yaml | 3 - jjb/l2switch/l2switch-csit-scalability.yaml | 3 - jjb/l2switch/l2switch-csit-switch.yaml | 3 - jjb/l2switch/l2switch-patch-test.yaml | 3 - jjb/l2switch/l2switch.yaml | 26 -- .../lispflowmapping-csit-msmr.yaml | 3 - jjb/lispflowmapping/lispflowmapping.yaml | 32 --- jjb/mdsal/mdsal-csit-bindingv1.yaml | 3 - jjb/mdsal/mdsal-csit-netty-replication.yaml | 3 - jjb/mdsal/mdsal-patch-test.yaml | 3 - jjb/nemo/nemo-csit-engine.yaml | 3 - jjb/nemo/nemo.yaml | 19 -- jjb/netconf/netconf-clustering-scale.yaml | 3 - jjb/netconf/netconf-clustering.yaml | 3 - jjb/netconf/netconf-csit-callhome.yaml | 3 - jjb/netconf/netconf-patch-test.yaml | 3 - jjb/netconf/netconf-scale.yaml | 10 - jjb/netconf/netconf-userfeatures.yaml | 3 - jjb/netconf/netconf.yaml | 28 -- .../netvirt-csit-hwvtep-openstack.yaml | 52 ---- .../netvirt-csit-multi-openstack-upgrade.yaml | 3 - jjb/netvirt/netvirt-csit-multi-openstack.yaml | 249 ------------------ jjb/netvirt/netvirt-job-reports.yaml | 69 ----- jjb/netvirt/netvirt-patch-test.yaml | 3 - jjb/netvirt/netvirt.yaml | 39 --- jjb/neutron/neutron-patch-test.yaml | 2 - jjb/neutron/neutron.yaml | 22 -- jjb/odlparent/odlparent-patch-test.yaml | 2 - jjb/odltools/odltools-csit.yaml | 3 - jjb/odltools/odltools-patch-test.yaml | 2 - jjb/odltools/odltools.yaml | 2 - jjb/of-config/of-config.yaml | 19 -- ...ugin-csit-bundle-based-reconciliation.yaml | 3 - .../openflowplugin-csit-cbench.yaml | 3 - ...flowplugin-csit-clustering-bulkomatic.yaml | 3 - ...lugin-csit-clustering-perf-bulkomatic.yaml | 3 - .../openflowplugin-csit-clustering.yaml | 3 - .../openflowplugin-csit-flow-services.yaml | 4 - .../openflowplugin-csit-longevity.yaml | 3 - .../openflowplugin-csit-perf-bulkomatic.yaml | 3 - ...flowplugin-csit-perf-stats-collection.yaml | 3 - .../openflowplugin-csit-sanity.yaml | 3 - .../openflowplugin-csit-scale-link.yaml | 3 - .../openflowplugin-csit-scale-switch.yaml | 3 - .../openflowplugin-csit-scale.yaml | 3 - .../openflowplugin-patch-test.yaml | 3 - jjb/openflowplugin/openflowplugin.yaml | 34 --- jjb/opflex/opflex-custom.yaml | 5 - jjb/opflex/opflex.yaml | 5 - jjb/ovsdb/ovsdb-csit-clustering.yaml | 3 - jjb/ovsdb/ovsdb-csit-southbound.yaml | 3 - jjb/ovsdb/ovsdb-full-integration.yaml | 2 - jjb/ovsdb/ovsdb-patch-test.yaml | 3 - jjb/ovsdb/ovsdb.yaml | 27 -- jjb/p4plugin/p4plugin.yaml | 19 -- jjb/packetcable/packetcable-csit-pcmm.yaml | 3 - jjb/packetcable/packetcable.yaml | 19 -- jjb/serviceutils/serviceutils-patch-test.yaml | 2 - jjb/serviceutils/serviceutils.yaml | 33 --- jjb/sfc/sfc-csit-full-deploy.yaml | 3 - jjb/sfc/sfc-csit-rest-basic.yaml | 3 - jjb/sfc/sfc-patch-test.yaml | 3 - jjb/sfc/sfc-python.yaml | 2 - jjb/sfc/sfc.yaml | 26 -- jjb/snmp/snmp.yaml | 18 -- jjb/snmp4sdn/snmp4sdn.yaml | 23 -- jjb/sxp/sxp-csit-basic.yaml | 3 - jjb/sxp/sxp-csit-binding-origin.yaml | 3 - jjb/sxp/sxp-csit-cluster-binding.yaml | 3 - jjb/sxp/sxp-csit-clustering.yaml | 3 - jjb/sxp/sxp-csit-filtering.yaml | 3 - jjb/sxp/sxp-csit-performance.yaml | 3 - jjb/sxp/sxp-csit-topology.yaml | 3 - jjb/sxp/sxp.yaml | 27 -- jjb/telemetry/telemetry-csit-basic.yaml | 3 - jjb/telemetry/telemetry.yaml | 25 -- jjb/transportpce/transportpce.yaml | 27 -- jjb/tsdr/tsdr-csit-cassandra.yaml | 3 - jjb/tsdr/tsdr-csit-elasticsearch.yaml | 3 - jjb/tsdr/tsdr-csit-hbase.yaml | 3 - jjb/tsdr/tsdr-csit-hsqldb.yaml | 3 - jjb/tsdr/tsdr.yaml | 23 -- jjb/unimgr/unimgr.yaml | 25 -- jjb/usc/usc-csit-tcp.yaml | 3 - jjb/usc/usc.yaml | 19 -- jjb/yangtools/yangtools-csit-system.yaml | 3 - jjb/yangtools/yangtools-patch-test.yaml | 3 - scripts/cut-branch-jobs.py | 2 +- 149 files changed, 11 insertions(+), 1844 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-magnesium.yaml delete mode 100644 jjb/autorelease/view-autorelease-magnesium.yaml delete mode 100644 jjb/dlux/dlux.yaml delete mode 100644 jjb/integration/csit-jobs-magnesium.lst delete mode 100644 jjb/netvirt/netvirt-job-reports.yaml diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 0a771869f..26e8409bf 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index c5156f1fd..ccdc972b1 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -16,9 +16,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" os-branch: "queens" diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index b9746c3f5..f9d166cb4 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -48,31 +48,6 @@ # 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: diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml index 638748d45..94a17c7de 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -71,30 +71,6 @@ # Used by the release job staging-profile-id: daa2b00117ed6 -- project: - name: alt-datastores-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: diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index f2e0cfc21..9d6fa5ed7 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -53,24 +53,6 @@ # 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: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 65a4c9f74..1506a995b 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" integration-test: aluminium - - magnesium: - branch: "stable/magnesium" - integration-test: magnesium project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 531d52a93..f8959dd2e 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -457,7 +457,7 @@ 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" diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 000aa2fe8..77ceb4659 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -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 index fa6e8bdd0..000000000 --- a/jjb/autorelease/validate-autorelease-magnesium.yaml +++ /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 index 62ff1c2b8..000000000 --- a/jjb/autorelease/view-autorelease-magnesium.yaml +++ /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 diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 03f5e8120..8ec2890c5 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 7b08a5612..0933d9a71 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 4fba92afd..157b39c75 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index cf43d213e..b9f3a84ca 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -24,9 +24,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index d46a5799c..acc6bb791 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 6495486cf..a4edec8f2 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 0e76879dd..c65065868 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 6fb08d460..ce3dcf207 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -18,9 +18,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" feature: - bgp: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 62cafe18a..61a16c9ff 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -95,38 +95,6 @@ # 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: diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index 946e7a12d..3e176a2a9 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -23,12 +23,9 @@ - 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: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index a437c2a15..56a277086 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -62,27 +62,6 @@ # Used by the release job staging-profile-id: 942a8075b1f2a -- project: - name: bier-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: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index f8e18bc1e..1b9ba8efa 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -74,31 +74,6 @@ # Used by the release job staging-profile-id: 96c0be46aac33 -- project: - name: coe-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: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index b2c926d62..22da66b73 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -20,9 +20,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index d98ab332a..b48edc317 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 70b4b7f0e..1cb0cec64 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -24,9 +24,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 40587064e..697a4d539 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -24,9 +24,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 46b6a29cc..d844c6970 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -24,9 +24,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index bef44f11d..5f304f042 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -24,9 +24,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index de489b8e4..fb45b7832 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -24,9 +24,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index fc3890e4c..e5ddddac8 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -24,9 +24,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 88a54f8ed..7b80ca4e3 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 7cad11d89..4a175a064 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 9ab8573ae..3457c1544 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 5a9c62286..aceec9f93 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 1fa23f4be..7949cae63 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -16,9 +16,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 1d9e89635..6068ffb04 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -80,34 +80,6 @@ # 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: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index ba58c6d39..8297973db 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index f442b3824..c6b84dd2a 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index a943672e9..1e22f4cfc 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -74,31 +74,6 @@ # 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: diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index a90c876a6..a220f8d6f 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -105,9 +105,9 @@ # 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 @@ -215,18 +215,12 @@ 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, @@ -245,15 +239,6 @@ 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, diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml index 1554246c4..1e0af1e58 100644 --- a/jjb/detnet/detnet.yaml +++ b/jjb/detnet/detnet.yaml @@ -74,31 +74,6 @@ # 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 index 9413a3ffd..000000000 --- a/jjb/dlux/dlux.yaml +++ /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 diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 127aa212c..0050f6a42 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index f82822e96..204b1e5be 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -59,26 +59,6 @@ # Used by the release job staging-profile-id: 96e6fb1e65bf9 -- project: - name: dluxapps-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: diff --git a/jjb/docs/docs-projects.yaml b/jjb/docs/docs-projects.yaml index feddf52e0..ad87d0bac 100644 --- a/jjb/docs/docs-projects.yaml +++ b/jjb/docs/docs-projects.yaml @@ -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 diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 98f57e5f5..b246d2cfc 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - - magnesium: - branch: "stable/magnesium" project: docs project-name: docs diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml index c367eae10..b700ec0ea 100644 --- a/jjb/docs/docs-template.yaml +++ b/jjb/docs/docs-template.yaml @@ -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 diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh index bf18ee194..50bc1c9e3 100644 --- a/jjb/docs/docs_version_bump.sh +++ b/jjb/docs/docs_version_bump.sh @@ -12,7 +12,7 @@ update_file_usage () { echo "Usage: $0 " 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 diff --git a/jjb/docs/docs_version_bump_projects.sh b/jjb/docs/docs_version_bump_projects.sh index 6db45944a..defda6d63 100644 --- a/jjb/docs/docs_version_bump_projects.sh +++ b/jjb/docs/docs_version_bump_projects.sh @@ -12,7 +12,7 @@ update_file_usage () { echo "Usage: $0 " 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 "" } diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 78b1f789b..944cac455 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -25,9 +25,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 59c108fc3..d1356e476 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -16,9 +16,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" os-branch: "rocky" diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index e901919e9..45738c47b 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -102,41 +102,6 @@ # 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: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 940ed771e..06a1cc5f9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -86,35 +86,6 @@ # 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: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index e3b456206..b459c7f0d 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -16,9 +16,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 98b2fb30e..5d9dece13 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -49,33 +49,6 @@ # 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 index 211ff12a4..000000000 --- a/jjb/integration/csit-jobs-magnesium.lst +++ /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, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 11aa74593..459ccb73a 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -18,9 +18,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 40d84f969..e224aca9c 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -30,11 +30,6 @@ java-version: openjdk11 jre: "openjdk11" karaf-version: odl - - magnesium: - branch: "stable/magnesium" - java-version: openjdk11 - jre: "openjdk11" - karaf-version: odl - project: name: distribution-managed @@ -89,25 +84,6 @@ 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 @@ -142,12 +118,6 @@ 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 @@ -173,9 +143,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" - project: name: distribution-sonar diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 96389f490..72d749bdc 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -49,16 +49,6 @@ 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 @@ -113,22 +103,6 @@ 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 @@ -150,10 +124,6 @@ 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" diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 504c1dcb2..b494f0d13 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 2d193a1c5..11ba9beaf 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -74,31 +74,6 @@ # 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: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index e389d7988..f68f89b84 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index f5fd4757f..b0a9d4f8a 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 0d9a365e1..58003f09b 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 54d8399d8..fa7e6d74b 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -19,9 +19,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" os-branch: "queens" diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 23f6beaec..758837e12 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -51,32 +51,6 @@ # 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: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index d5c7d1819..35c5ce585 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 25598d58f..6d36a9602 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -95,38 +95,6 @@ # 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: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index c5ed3ba39..54f92b654 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index bedb8fba5..6e6eb6e1d 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index 8c5096c91..49838f97e 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -16,9 +16,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" os-branch: "queens" diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index f5117303f..6195648a3 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 210a975ad..e2a3e38a8 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a67a9890f6202 -- project: - name: nemo-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: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 03083928f..f73b589f3 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 4119d427f..5efea41d8 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 2b6d9dea2..4896fcf8d 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 3827b6191..141da5e1c 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -16,9 +16,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" os-branch: "queens" diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 94532319e..45f3b9487 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: @@ -76,13 +73,6 @@ "-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: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index ec9e174c7..b0c3c1eaf 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -27,9 +27,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 0c18d9da1..a41ee0f64 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -54,34 +54,6 @@ # 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: diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 5b3b2a2e4..508fc27a3 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -150,55 +150,3 @@ 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}" diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 83b4f6d52..23af285fa 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -54,9 +54,6 @@ project: "netvirt" stream: - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" - aluminium: branch: "stable/aluminium" jre: "openjdk11" diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index fcea39191..f61e372df 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -334,255 +334,6 @@ 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 index 4530e8379..000000000 --- a/jjb/netvirt/netvirt-job-reports.yaml +++ /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 diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index f237dd89b..9a5f57dd6 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -16,9 +16,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" os-branch: "rocky" diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 056fbac01..ad45dc471 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -114,45 +114,6 @@ # 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: diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 6c3f0f443..d4de8d2b8 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -13,8 +13,6 @@ branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - - magnesium: - branch: "stable/magnesium" os-branch: "queens" diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 0e95f91d9..9c80a472e 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -65,28 +65,6 @@ # 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: diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index d965488c5..8939180cc 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -13,8 +13,6 @@ branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - - magnesium: - branch: "stable/magnesium" os-branch: "queens" diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index f25fa3295..23a14691a 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -19,9 +19,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" functionality: - "upstream" diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index 169fedf3f..9a813510a 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -14,8 +14,6 @@ branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - - magnesium: - branch: "stable/magnesium" feature: - current: diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index 7ba16eaba..83c30e919 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -15,8 +15,6 @@ branch: "master" - aluminium: branch: "stable/aluminium" - - magnesium: - branch: "stable/magnesium" project: odltools project-name: odltools diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index ca574c2aa..3c1ae1870 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a6880455efe67 -- project: - name: of-config-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: diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 15beb0293..638377d81 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -19,9 +19,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 2cc283371..4ab1ba2cf 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 75aa05d30..bd55d1b62 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 5b8f2e2cb..8162bea49 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index b311c682f..8cc7e99e8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 14d96f180..ae9e3cf8f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -26,10 +26,6 @@ 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" diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 752e0c0c0..ecf101387 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -25,9 +25,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 0daba8743..7e181e686 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 9fab2adcd..fc72ecab1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 08a79bbc1..d88cad107 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 297eca372..7a112bf96 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 9b8613c9a..2c34ba4da 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index df11aec17..76b448d0c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index fb7b69847..216d02110 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -18,9 +18,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 4b2667902..a12acc733 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -101,40 +101,6 @@ # 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: diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 6977b77b9..8ab70dab5 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -21,11 +21,6 @@ libuv-version: "1.20.2" rapidjson-version: "1.1.0" openvswitch-version: "2.12.0" - - 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" diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index f09d5a3f3..7005227de 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -20,11 +20,6 @@ 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" diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 428ddbe1c..d1a6f8f48 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 9f35a9ac3..fcd1b5c42 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -23,9 +23,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 04a0ea1b8..972f0418f 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -14,8 +14,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" project: "ovsdb" archive-artifacts: "*.log" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 0b0a0072a..493978ac2 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -17,9 +17,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index ca2647613..204857223 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -80,33 +80,6 @@ # 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: diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 69d3e9e1d..b2ea5b1b5 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a68bf26e208d4 -- project: - name: p4plugin-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: diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index b39ec57f1..80f33cc74 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -24,9 +24,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index f67129aef..5b97889cc 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a68ca4a24655c -- project: - name: packetcable-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: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index aa2e7fa02..a38df8164 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -13,8 +13,6 @@ branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - - magnesium: - branch: "stable/magnesium" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 9a9656900..37154b12a 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -98,39 +98,6 @@ # 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: diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 810c901ac..239286738 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 1dc97267e..33b754160 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 0f67df687..49efcec84 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -18,9 +18,6 @@ - aluminium: branch: "stable/aluminium" java-version: "openjdk11" - - magnesium: - branch: "stable/magnesium" - java-version: "openjdk11" os-branch: "queens" diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 1bd4f5d99..6912502be 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -11,8 +11,6 @@ branch: "stable/silicon" - aluminium: branch: "stable/aluminium" - - magnesium: - branch: "stable/magnesium" project: "sfc" project-name: "sfc" diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index a02fee1db..67e2faa1b 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -77,32 +77,6 @@ # Used by the release job staging-profile-id: a68eb361ca48a -- project: - name: sfc-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: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 31bf3eb5a..62d77a1e4 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -53,24 +53,6 @@ # Used by the release job staging-profile-id: a68fb236b93a6 -- project: - name: snmp-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: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 7fb6aa10a..d579f56c2 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -68,29 +68,6 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 -- project: - name: snmp4sdn-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: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 1370cb42c..c49b9c9ab 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml index 4f206daad..fc1ddf4e0 100644 --- a/jjb/sxp/sxp-csit-binding-origin.yaml +++ b/jjb/sxp/sxp-csit-binding-origin.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/sxp/sxp-csit-cluster-binding.yaml b/jjb/sxp/sxp-csit-cluster-binding.yaml index 000e42a35..6b6e7cab8 100644 --- a/jjb/sxp/sxp-csit-cluster-binding.yaml +++ b/jjb/sxp/sxp-csit-cluster-binding.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index f9abe90f4..3d01a6f79 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index f75dff42e..2b932a347 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index ce1a33822..a981c1525 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index cd52b4248..2190c0fc4 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 06a2efa0b..1221bf20d 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -80,33 +80,6 @@ # 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: diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml index f6f8c7ffa..f2ed32814 100644 --- a/jjb/telemetry/telemetry-csit-basic.yaml +++ b/jjb/telemetry/telemetry-csit-basic.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index 71f721774..8a4f4604c 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -74,31 +74,6 @@ # Used by the release job staging-profile-id: 8ed9c52266504 -- project: - name: telemetry-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: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 6cf989e5a..0c1e5346c 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -80,33 +80,6 @@ # 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: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index e6d3cd949..5e7f43154 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index b1fb21a92..3acb1c70a 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 4c7d127e9..1ae40ec2c 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 33d2f60ac..f670686be 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index cb45be896..dc3328524 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -68,29 +68,6 @@ # Used by the release job staging-profile-id: a69373036303c -- project: - name: tsdr-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: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index dabac9d4c..c762c7aa6 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -86,31 +86,6 @@ # 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: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index b0fa5de3c..08114e284 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -22,9 +22,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - all: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 116decf25..5360a15d9 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -56,25 +56,6 @@ # Used by the release job staging-profile-id: a697b633b3ffe -- project: - name: usc-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: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 9905290fd..40e9ceda7 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -21,9 +21,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" install: - only: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 9957520e3..70b9e7519 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -16,9 +16,6 @@ - aluminium: branch: "stable/aluminium" jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" os-branch: "queens" jdk: "openjdk8" diff --git a/scripts/cut-branch-jobs.py b/scripts/cut-branch-jobs.py index 29cb121f3..a1c813ae5 100755 --- a/scripts/cut-branch-jobs.py +++ b/scripts/cut-branch-jobs.py @@ -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 ), ) -- 2.36.6