Feat!: Remove all stable/aluminium jobs 39/97739/1
authorAnil Belur <abelur@linuxfoundation.org>
Tue, 5 Oct 2021 02:58:34 +0000 (12:58 +1000)
committerAnil Belur <abelur@linuxfoundation.org>
Tue, 5 Oct 2021 02:58:34 +0000 (12:58 +1000)
Phosphorus has been released which marks EOL
for aluminum branch.

This change will remove all the Aluminium jobs
from Jenkins CI.

Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-3959
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I5c8ca9a5a258caa853537107e996f6eb169d3b4b

109 files changed:
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/archetypes/archetypes.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/validate-autorelease-aluminium.yaml [deleted file]
jjb/autorelease/view-autorelease-aluminium.yaml [deleted file]
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bgpcep/bgpcep.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/docs/docs-rtd.yaml
jjb/docs/docs-template.yaml
jjb/docs/docs_version_bump.sh
jjb/docs/docs_version_bump_projects.sh
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/csit-jobs-aluminium.lst [deleted file]
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/integration-test-jobs.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal-csit-netty-replication.yaml
jjb/mdsal/mdsal-patch-test.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-distribution-mri-test.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml [deleted file]
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron-patch-test.yaml
jjb/neutron/neutron.yaml
jjb/odlmicro/odlmicro-csit.yaml
jjb/odlmicro/odlmicro.yaml
jjb/odlparent/odlparent-patch-test.yaml
jjb/odlsaf/odlsaf.yaml
jjb/odltools/odltools-csit.yaml
jjb/odltools/odltools-patch-test.yaml
jjb/odltools/odltools.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/serviceutils/serviceutils-patch-test.yaml
jjb/serviceutils/serviceutils.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/transportpce/transportpce.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml
scripts/cut-branch-jobs.py

index 51ff7cdec0e7fe9a9d127cdef951f81dfab37a9f..47ea576f44095f625536871017655aabd76fbf2a 100644 (file)
@@ -22,9 +22,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 96f5474912677d18f45dd15cf04f77bc0828945b..8917abc17b81bdb03a3eccdd30850bc4ceff3eb5 100644 (file)
@@ -16,9 +16,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 
index 40eab4505338837c29fe363fd073bf2ce815b1cf..661b74e5b1c29448e16e6bc19417ab15dd2e3420 100644 (file)
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
-- project:
-    name: aaa-aluminium
-    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: aluminium
-    project: "aaa"
-    project-name: "aaa"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "aaa-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
-
 - project:
     name: aaa-release-management
     jobs:
index 185b64888ff051838897e825b0d42a2e3d667aa9..fef79a6f7f6662b23cd72a75d1294db4bbed8351 100644 (file)
     # Used by the release job
     staging-profile-id: d88dcfe6ce48d
 
-- project:
-    name: archetypes-aluminium
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "archetypes"
-    project-name: "archetypes"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "archetypes-settings"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
-    email-upstream: "[archetypes] [odlparent] [yangtools] [controller] [mdsal]"
-
-    # Used by the release job
-    staging-profile-id: d88dcfe6ce48d
-
 - project:
     name: archetypes-sonar
     jobs:
index 634981da02a4a72f1d7a009f4f7e54fdec1cf7ca..2099daf2b602e954fcab251e329f979b8a924096 100644 (file)
@@ -22,9 +22,6 @@
       - silicon:
           branch: "stable/silicon"
           integration-test: silicon
-      - aluminium:
-          branch: "stable/aluminium"
-          integration-test: aluminium
 
     project: releng/autorelease
     project-name: autorelease
index f8959dd2e4ac3ad7adc5f29badfe437e54959045..73071418c3f3338500caaae319ebefded3c40f6c 100644 (file)
           name: RELEASE
           description: |
             Release to generate release notes for.
-            Eg. Aluminium-SR2, Silicon-SR1 ...
+            Eg. Silicon-SR1, Phosphorus-SR2 ...
     scm:
       - lf-infra-gerrit-scm:
           git-url: "$GIT_URL/$GERRIT_PROJECT"
index 1fbc9cb0f263577b7d612fe68d7203767447ced5..bd9d0ae786de5658e01ed85dad9680650c7550f7 100644 (file)
@@ -17,5 +17,3 @@
           branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-aluminium.yaml
deleted file mode 100644 (file)
index faed8eb..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
-- project:
-    name: autorelease-validate-aluminium
-    jobs:
-      - "{project-name}-validate-autorelease-{stream}"
-    stream: aluminium
-    branch: stable/aluminium
-    project-name:
-      - aaa:
-          project: aaa
-      - bgpcep:
-          project: bgpcep
-      - daexim:
-          project: daexim
-      - genius:
-          project: genius
-      - 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-aluminium.yaml b/jjb/autorelease/view-autorelease-aluminium.yaml
deleted file mode 100644 (file)
index 630ef68..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
----
-# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
-- releng_view: &releng_autorelease_view_common_aluminium
-    name: releng-view-autorelease-aluminium
-    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-Aluminium
-    description: "List of Aluminium Merge jobs for Autorelease"
-    job-name:
-      - "aaa-maven-merge-aluminium"
-      - "bgpcep-maven-merge-aluminium"
-      - "daexim-maven-merge-aluminium"
-      - "genius-maven-merge-aluminium"
-      - "integration/distribution-maven-merge-aluminium"
-      - "jsonrpc-maven-merge-aluminium"
-      - "lispflowmapping-maven-merge-aluminium"
-      - "netconf-maven-merge-aluminium"
-      - "netvirt-maven-merge-aluminium"
-      - "neutron-maven-merge-aluminium"
-      - "openflowplugin-maven-merge-aluminium"
-      - "ovsdb-maven-merge-aluminium"
-      - "serviceutils-maven-merge-aluminium"
-    <<: *releng_autorelease_view_common_aluminium
index 4d8ca3e3cfc7692d6fd46f1cda1d81d416bb9dbd..2f97fe8509952ca55f00c3b34026ac5ecdbfe4b1 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 2e516db3d0f64cd4e25a4d8159aee9783cbfa104..37851551e4d35700f8e8fe3559c83a23d889022b 100644 (file)
@@ -22,9 +22,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 7157b9fe67f1b9de5dee06d7271869e857f4d45d..94ef8475e3fc02d979eb93fd153f7c1f8b431ed8 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index d79d3f5705a8ce5b852c8fe01cc70d63c2de83c0..ab916a36be4dc24c3cde36e15262d3da2f203bfa 100644 (file)
@@ -24,9 +24,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 36866c197510be210cbc1d6f0ca0af39a0eedd9b..deb75fafd62a0d5432ecbf56bb5c5b4c7f36ef08 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index acd6b40e429de1b25dae357917fffc5a797ab8aa..a8ec64e00d809c2e08bebc295a12609b8809cb0d 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 2b653c48e6823285d96976f6072ec08a08bc6931..d34ffae527c56f0cf6fda49a23551deea81bc519 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 9702222e5875ae41237daf1d5ed4296c375f8ccb..e15aa935300d7e2ace9d520da63ecde0f9f39b2b 100644 (file)
@@ -18,9 +18,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     feature:
       - bgp:
index 2eeefc9367b12ba5e7181f0bfc11dbced601ce7f..560e8c1e0d8b9609808aa1b09490fd643d2fa2f6 100644 (file)
     # Used by the release job
     staging-profile-id: 9427a05049030
 
-- project:
-    name: bgpcep-aluminium
-    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: aluminium
-    project: "bgpcep"
-    project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "bgpcep-settings"
-    mvn-opts: "-Xmx2048m"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      mdsal-merge-{stream}
-    email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-    # Used by the release job
-    staging-profile-id: 9427a05049030
-
 - project:
     name: bgpcep-release-management
     jobs:
index 7d5f7eba81c37cce182607241715e9180b729fca..92965a89a7c6e8fd9188ce983fdad85bbfcbff66 100644 (file)
@@ -20,9 +20,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index ec33db83135fff499b2c7d2d6d8bcb28cba69b09..e3e9e9a27a1a2ac39b3bedccd64aa66a73d85531 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index f35e89082728a4e7d5e46a7a31854e9f54a0a27a..784254de6ae9f70e603fc8d871b5ac108aa4e866 100644 (file)
@@ -24,9 +24,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index a3d1ba7e9adc306ec2a610055f97e716ff5b047a..49f9c205f2de03cfe3d11a5800de9d596b22bbb9 100644 (file)
@@ -24,9 +24,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 0587e79e233ecc5636d8cdcfee615ecc4b5af248..8dfe6fececc358fa190b2446ad2b1e8f289c3b01 100644 (file)
@@ -24,9 +24,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index b75ffd58bc9ab1d01a39709eb08e5b66b212ad73..6265325aecc2d130c23ae35200381ba58acc1b2b 100644 (file)
@@ -24,9 +24,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 3788500306b6935fa7b121db85ba12cf63d91eb6..8bf68eb9513231391d5d19c659dd1c2a37c6157f 100644 (file)
@@ -24,9 +24,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index aa88ab063f1de53158527c4d183b1f865cd69275..19484156336eb90239a2cea47c4a8271ca260ac0 100644 (file)
@@ -24,9 +24,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index fb4ed988a39cccee7c17beea00d1d5b951e7bdfd..daaef5d251214987aa1bd3ad62ba3aa9c58f2d41 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 9368e149d35590822e2bda2674d7e035b15d0424..0b4444bd0db3fe970277216da85415b10883012b 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index fd463c516cde7e8374ade4fa1901130cc4c4a93b..c2858adcd3f316abcdbe5eb836975e057682e7f8 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 54d18d5403f4b628257acd5df00b4f830085151c..5b52733069db4d6d38b66675a39d4b690c3383e9 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 46656a77e4a0e79e5082c912961965e225609fed..3caa4d9d2c53e3e0547b5b15b9db0a637fe67474 100644 (file)
@@ -16,9 +16,6 @@
       - silicon:
           branch: "3.0.x"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "2.0.x"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 209f583fc1f9fc1b1e8f4d2ba411e64628b99f68..a6b016cb2f2a94bbf71e7ca310b4f13600081b8b 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 08b64df75639d38f1c5d460d04f595e52f2a910a..fd290fbe3b93a32116b8a2f380a0bf6b3bb58090 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 0a4e37c5bfcaf248ae61a5ef23a65639d5b82605..377dab05cfa22cc5a03d1944f4c619ede499a64b 100644 (file)
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-aluminium
-    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: aluminium
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "daexim-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: 96e4dade34bd7
-
 - project:
     name: daexim-sonar
     jobs:
index b09ced73f36b777d17d551ff1570673e0aa4da01..be081b88366d0d584851f57cbfdead1e786da62d 100644 (file)
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/aluminium
+    verify-branch: stable/silicon
     # Value for ODL_STREAM
-    verify-stream: aluminium
+    verify-stream: silicon
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
       netconf-csit-3node-clustering-only-silicon,
       netconf-csit-3node-clustering-scale-only-silicon,
       yangtools-csit-1node-system-only-silicon
-    csit-mri-list-aluminium: >
-      controller-csit-1node-akka1-all-aluminium,
-      controller-csit-1node-benchmark-all-aluminium,
-      controller-csit-1node-rest-cars-perf-all-aluminium,
-      controller-csit-3node-benchmark-all-aluminium,
-      controller-csit-3node-clustering-ask-all-aluminium,
-      controller-csit-3node-clustering-tell-all-aluminium,
-      controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium,
-      controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
-      mdsal-csit-3node-netty-replicate-only-aluminium,
-      yangtools-csit-1node-system-only-aluminium
     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-weekly-list-silicon: >
       controller-csit-1node-notifications-longevity-only-silicon,
       controller-csit-3node-drb-partnheal-longevity-only-silicon,
       distribution-deploy-silicon,
       distribution-offline-silicon,
       openflowplugin-csit-1node-longevity-only-silicon
-    csit-weekly-list-aluminium: >
-      controller-csit-1node-notifications-longevity-only-aluminium,
-      controller-csit-3node-drb-partnheal-longevity-only-aluminium,
-      controller-csit-3node-drb-precedence-longevity-only-aluminium,
-      controller-csit-3node-ddb-expl-lead-movement-longevity-only-aluminium,
-      bgpcep-csit-3node-bgpclustering-longevity-only-aluminium,
-      distribution-deploy-aluminium,
-      distribution-offline-aluminium,
-      openflowplugin-csit-1node-longevity-only-aluminium
     csit-mri-list-phosphorus: >
       aaa-csit-1node-authn-all-phosphorus,
       controller-csit-1node-akka1-all-phosphorus,
index 6183c161b676806a33d758dca77efa96cc9ffe05..4f736eebbac293b66ae0ae764f6ba5872a3c2976 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index b2e86ef0b390830205bc3aa3b8a32871ea6cd595..56c4ad9ac524967a1d4bd6abb0361eb2efd87452 100644 (file)
@@ -12,8 +12,6 @@
           branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     project: docs
     project-name: docs
index b700ec0ea70103b48ecec39db5f99ef541aa68d2..d0d42157bed6958e07e82b65482329bb5937cce2 100644 (file)
@@ -29,7 +29,7 @@
           lftools-version: "{lftools-version}"
       - string:
           name: RELEASE_NAME
-          description: "The next release name eg: Aluminium, Silicon."
+          description: "The next release name eg: Silicon, Phosphorus."
       - bool:
           name: PUBLISH
           default: false
index 50bc1c9e3e43411b54d66c682869ee1f87102f67..fd9b06586644c99e1c26bdd74181d1364757f5fc 100644 (file)
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <RELEASE_NAME> <PUBLISH>"
     echo ""
-    echo "    RELEASE_NAME:  The RELEASE_NAME eg: Aluminium, Silicon."
+    echo "    RELEASE_NAME:  The RELEASE_NAME eg: Silicon, Phosphorus."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }
index defda6d63112ec4290c05f43bb97e07a5462ce4c..b92a648082b9ea0fb6f2dd7996015e6b0d721a5e 100644 (file)
@@ -12,7 +12,7 @@
 update_file_usage () {
     echo "Usage: $0 <release_name> <PUBLISH>"
     echo ""
-    echo "    release_name:  The release_name e.g Aluminium, Silicon."
+    echo "    release_name:  The release_name e.g Silicon, Phosphorus."
     echo "    PUBLISH:  Set to true to PUBLISH"
     echo ""
 }
index 4eac39299bfa15d111859c214cbab53462c9b8a9..833637361d14249e6f32c96e67e7826472539ae9 100644 (file)
@@ -19,9 +19,6 @@
       - master:
           branch: "master"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 54e2cb182bf31f8d038a9d7f14fee2e8fe532024..6e3f8f552081df35e7a50afe94fd1e7e51fe9f79 100644 (file)
@@ -10,9 +10,6 @@
       - master:
           branch: "master"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "rocky"
 
index ea5d8dc85b7b91aa4af03f4c0fb5c764c7f2e228..ee4fad157806f9ccf9831d7d6f82d1e8047041aa 100644 (file)
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
-- project:
-    name: genius-aluminium
-    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: aluminium
-    project: "genius"
-    project-name: "genius"
-    branch: "stable/aluminium"
-    build-node: centos7-builder-2c-8g
-    java-version: "openjdk11"
-    mvn-settings: "genius-settings"
-    mvn-opts: "-Xmx1024m"
-    build-timeout: 90
-    dependencies: >
-      controller-merge-{stream},
-      yangtools-merge-{stream},
-      odlparent-merge-{stream},
-      openflowplugin-merge-{stream},
-      neutron-merge-{stream}
-    email-upstream:
-      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
-      \ [neutron]"
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
-
 - project:
     name: genius-sonar
     jobs:
index e56e68159df628e648f5e9ec195df54e9c4d7045..0a80ac274afdda3563bd00d83a5a5a365c0b621a 100644 (file)
@@ -16,9 +16,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"
index bdfede3dd9956a023ccfa91ebd9d2b0444539ef1..e2fdb54470bbdf7e4c5b20ea3c8b55a6e47a9120 100644 (file)
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
-- project:
-    name: infrautils-1.8.x
-    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: aluminium
-    project: "infrautils"
-    project-name: "infrautils"
-    branch: "1.8.x"
-    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-aluminium.lst b/jjb/integration/csit-jobs-aluminium.lst
deleted file mode 100644 (file)
index f4ca504..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-aaa-csit-1node-authn-all-aluminium,
-bgpcep-csit-1node-bgp-ingest-all-aluminium,
-bgpcep-csit-1node-bgp-ingest-mixed-all-aluminium,
-bgpcep-csit-1node-throughpcep-all-aluminium,
-bgpcep-csit-1node-userfeatures-all-aluminium,
-daexim-csit-1node-basic-only-aluminium,
-daexim-csit-3node-clustering-basic-only-aluminium,
-distribution-csit-1node-userfeatures-all-aluminium,
-distribution-csit-managed-aluminium,
-genius-csit-1node-upstream-only-aluminium,
-genius-csit-3node-upstream-only-aluminium,
-jsonrpc-csit-1node-basic-only-aluminium,
-netconf-csit-1node-callhome-only-aluminium,
-netconf-csit-1node-scale-max-devices-only-aluminium,
-netconf-csit-1node-scale-only-aluminium,
-netconf-csit-1node-userfeatures-all-aluminium,
-netconf-csit-1node-userfeatures-rfc8040-all-aluminium,
-netconf-csit-3node-clustering-only-aluminium,
-netconf-csit-3node-clustering-scale-only-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
-odltools-csit-1node-upstream-all-aluminium,
-openflowplugin-csit-1node-cbench-only-aluminium,
-openflowplugin-csit-1node-flow-services-all-aluminium,
-openflowplugin-csit-1node-perf-bulkomatic-only-aluminium,
-openflowplugin-csit-1node-perf-stats-collection-only-aluminium,
-openflowplugin-csit-1node-scale-link-only-aluminium,
-openflowplugin-csit-1node-scale-only-aluminium,
-openflowplugin-csit-1node-scale-switch-only-aluminium,
-openflowplugin-csit-3node-clustering-bulkomatic-only-aluminium,
-openflowplugin-csit-3node-clustering-only-aluminium,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-aluminium,
-ovsdb-csit-1node-upstream-southbound-all-aluminium,
-ovsdb-csit-3node-upstream-clustering-only-aluminium,
index 459ccb73a0bc900b8777579afc37c3adfec0b31c..8a7d036f9fdc064e0137c7f730efc76b9e651283 100644 (file)
@@ -15,9 +15,6 @@
       - silicon:
           branch: "master"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 5f0878d93c0389d723285bc4a194b6118a6a36e1..37083f18b99e383d728736a4725ac23778299e25 100644 (file)
@@ -30,8 +30,6 @@
           branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
 - project:
     name: distribution-managed
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
-          dependencies: >
-            aaa-maven-merge-{stream},
-            bgpcep-maven-merge-{stream},
-            daexim-maven-merge-{stream},
-            genius-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
           branch: "stable/silicon"
           dependencies: >
             distribution-merge-managed-{stream},
-      - aluminium:
-          branch: "stable/aluminium"
-          dependencies: >
-            distribution-merge-managed-{stream},
 
 - project:
     name: distribution-release
           branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
 - project:
     name: distribution-sonar
index 63595dedd2e9d4dbf73eadf2bcc13d8bdab76fb3..57d1c586eb8c53e5d78d5b03f0e852c41ae543fb 100644 (file)
             daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping
             bgpcep integration/distribution
 
-      - aluminium:
-          branch: "stable/aluminium"
-          mvn-version: "mvn35"
-          java-version: "openjdk11"
-          csit-list: !include: csit-jobs-aluminium.lst
-          build-order: >
-            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
-            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
-            bgpcep integration/distribution
-
 - project:
     name: integration-distribution
     project: integration/test
           csit-list: !include: csit-jobs-silicon.lst
           csit-mri-list: "{csit-mri-list-silicon}"
           csit-weekly-list: "{csit-weekly-list-silicon}"
-      - aluminium:
-          branch: "stable/aluminium"
-          csit-blocklist: >
-            bier controller dluxapps lispflowmapping l2switch mdsal nemo
-            odlmicro packetcable sfc sxp telemetry tsdr 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-aluminium.lst
-          csit-mri-list: "{csit-mri-list-aluminium}"
-          csit-weekly-list: "{csit-weekly-list-aluminium}"
 
 - project:
     name: integration-sanity
           branch: "stable/silicon"
           karaf-version: odl
           csit-sanity-list: "{csit-sanity-list-silicon}"
-      - aluminium:
-          branch: "stable/aluminium"
-          karaf-version: odl
-          csit-sanity-list: "{csit-sanity-list-aluminium}"
 
 - job-template:
     name: "integration-merge-dashboard"
index 910d7c468097feb76dee8d0e24cdc854ac15108c..697fccb9346db175174e704874f98fc2daeca440 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 7880527bd39ba13bb86cf4e2d2390d077d31e7d1..39aec0c4f71385ae3edf11d8bb6ac266366b9e28 100644 (file)
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-aluminium
-    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: aluminium
-    java-version: "openjdk11"
-    branch: "stable/aluminium"
-    mvn-settings: "jsonrpc-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
-    email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"
-
-    # Used by the release job
-    staging-profile-id: 96fdf4408765d
-
 - project:
     name: jsonrpc-release-management
     jobs:
index aa00faa353fdc7fa81f1794f27661c1063d1c6cd..916f0494d6c7e40520d2db781de98f429a1042cb 100644 (file)
@@ -22,9 +22,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 78996a18c2ffa1c9a84734240962aa83b89860aa..4d7482a3c203bedef14d3120f33575974e8b3488 100644 (file)
@@ -22,9 +22,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 1beea9b9eeb3228904d56678b6faf39510e2e62b..6ed3621c7af55e6bbdee24b0821065db2ae96903 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index c4f39c077444dd2b19679066de62e0d03744b8ce..4d8313801c30681ebcc1d26be9a8320c7518592c 100644 (file)
@@ -19,9 +19,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     os-branch: "queens"
 
index 5121ae3f6d540631efb9a38d7df58dd085786cde..7b40eea2fd659209049e239b97f000e279eeb73d 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index d2c3f3bd195f56daa098259a37efe9623bc6b72c..21d89fbe3c180e50c2de706d5b7b663722707394 100644 (file)
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-aluminium
-    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: aluminium
-    project: "lispflowmapping"
-    project-name: "lispflowmapping"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "lispflowmapping-settings"
-    mvn-goals: "clean deploy -DrepoBuild"
-    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
-    dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}"
-    email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]"
-    archive-artifacts: >
-      **/*.log
-      **/target/surefire-reports/*-output.txt
-
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: 96fff2503b766
-
 - project:
     name: lispflowmapping-sonar
     jobs:
index 9e993e4c33e7c02cdc428c54c95bd96c3b2d880f..d0a5a4dbddaeb91ae27e3c7674a21bbc9e2191ab 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 79da29316a4c1e097bb658408237606670a09cba..4574617725fdab30a983ff5c8e1bd5309ece3c08 100644 (file)
             odl-restconf-nb-bierman02,
             odl-netconf-clustered-topology,
             odl-clustering-test-app
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-          install-features: >
-            features-controller,
-            odl-mdsal-exp-replicate-netty,
-            odl-restconf-nb-bierman02,
-            odl-netconf-clustered-topology,
-            odl-clustering-test-app
 
     install:
       - only:
index a298aba697f3d147d677f039156cbf5239af4a58..b405266f1459f7671b59086d235875605d57397a 100644 (file)
@@ -16,9 +16,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 
index 49e5a8164240c4391b741c3ef1aa59f5e12cd3a2..aa4f502dc1d4c3551b742d0cb9f6115f5ae9cd20 100644 (file)
@@ -18,9 +18,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
index cdc0e1a057cf45fa88243408423e565e5ce75355..2c2fd9bbcd9a88ac741c7ccecc344424feaf8ded 100644 (file)
@@ -18,9 +18,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
index 7f3dd75afb5629366947a273bbc572677c1b1091..952e03c8fd26f910c86d24ecc7ae75515ed93d26 100644 (file)
@@ -20,9 +20,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
index de768e63f25a5cce90594b49bc6b6ba376ad62ca..016cf13c1a58e865ad17dad919cd2732b94e30fb 100644 (file)
@@ -13,9 +13,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 
index 5dbe246fa194724e6fcd63053bf567d439f02f85..1b8bdc6489e93e08eaa153a6ff58e549d4611e5f 100644 (file)
@@ -13,9 +13,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
 
index 0ce1f29409d4b6c471a148233bff18aa020732af..84eede89ae0122597c6532d0e5176ad1e0763cab 100644 (file)
@@ -18,9 +18,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
             \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
             \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-          robot-options:
-            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v\
-            \ INIT_DEVICE_COUNT:1000 -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:500\
-            \ -v TESTTOOL_BOOT_TIMEOUT:600s -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
 
     karaf-version: netconf
 
index 1bf4193a7c4fe964859ffc8ff0217499c381e65f..d8bfeb02f3e0520564a0856804b3184f4448a50c 100644 (file)
@@ -24,9 +24,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     karaf-version: netconf
 
index e4f7cab67065116e5854fa7e7753d2e5f89fab98..db43ae95cbfe57d76e4cc2179b73f688909f2d7a 100644 (file)
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
-- project:
-    name: netconf-aluminium
-    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: aluminium
-    project: "netconf"
-    project-name: "netconf"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    karaf-version: "netconf"
-    mvn-settings: "netconf-settings"
-    mvn-goals: "clean deploy -Pintegrationtests"
-    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
-    build-timeout: 90
-    dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]"
-
-    # Used by the release job
-    staging-profile-id: a67b22fc3663f
-
 - project:
     name: netconf-1.7.4.x
     jobs:
index c133627014e2bfa8dad9ef414bf98878f79ed0ed..7da5ac97e6a428e38170e4303edd74ffa04b6aad 100644 (file)
           odl-ml2-port-binding: "pseudo-agentdb-binding"
           openstack_system_image: "{openstack_stein_system_image}"
           openstack_system2_image: "{openstack_stein_system_image}"
-
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: "netvirt"
-    stream: "aluminium"
-    branch: "stable/aluminium"
-    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
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: "yes"
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: "yes"
-          install-features: "odl-jolokia,odl-netvirt-openstack"
-
-    functionality:
-      - upstream-stateful
-      - gate-stateful
-
-    openstack:
-      - 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}"
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
deleted file mode 100644 (file)
index 24b0e06..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
----
-- project:
-    name: netvirt-csit-upgrade-openstack-integration-rocky-aluminium
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: "netvirt"
-
-    stream:
-      - aluminium:
-          branch: "master"
-          jre: "openjdk11"
-
-    testplan: "{project}-{topology}-openstack-upgrade.txt"
-    odl-ml2-driver-version: "v2"
-    enable-openstack-services: "placement-api,l2gw-plugin"
-    enable-openstack-compute-services: "placement-client"
-    security-group-mode: "stateful"
-    group-add-mod-enabled: "true"
-    odl_system_flavor: v3-standard-2
-    openstack_system_flavor: v3-standard-8
-    openstack_system2_flavor: v3-standard-4
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-
-    functionality:
-      - upgrade
-      - upgrade-snat-conntrack:
-          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-upgrade-openstack-integration-stein
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: "netvirt"
-
-    stream:
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-
-    testplan: "{project}-{topology}-openstack-upgrade.txt"
-    odl-ml2-driver-version: "v2"
-    enable-openstack-services: "placement-api,l2gw-plugin"
-    enable-openstack-compute-services: "placement-client"
-    security-group-mode: "stateful"
-    group-add-mod-enabled: "true"
-    odl_system_flavor: v3-standard-2
-    openstack_system_flavor: v3-standard-8
-    openstack_system2_flavor: v3-standard-4
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-
-    functionality:
-      - upgrade
-      - upgrade-snat-conntrack:
-          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-upgrade-openstack-integration-stein-master
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: "netvirt"
-
-    stream:
-      - master:
-          branch: "master"
-          jre: "openjdk11"
-
-    testplan: "{project}-{topology}-openstack-upgrade.txt"
-    odl-ml2-driver-version: "v2"
-    enable-openstack-services: "placement-api,l2gw-plugin"
-    enable-openstack-compute-services: "placement-client"
-    security-group-mode: "stateful"
-    group-add-mod-enabled: "true"
-    odl_system_flavor: v3-standard-2
-    openstack_system_flavor: v3-standard-8
-    openstack_system2_flavor: v3-standard-4
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-
-    functionality:
-      - upgrade
-      - upgrade-snat-conntrack:
-          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}"
index 8f24005bb42fa5a8c0e85155e4f1c9ce224ac7fa..461b078955e2aef09e171f3b1787f9fb8fabb34b 100644 (file)
           openstack_system_image: "{openstack_stein_system_image}"
           openstack_system2_image: "{openstack_stein_system_image}"
 
-- project:
-    name: netvirt-csit-openstack-integration-aluminium-rocky
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: "netvirt"
-    stream: "aluminium"
-    branch: "stable/aluminium"
-    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-standard-4
-    tools_system_count: 0
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: "no"
-          install-features: "odl-netvirt-openstack"
-          robot-options: "-v FAIL_ON_EXCEPTIONS:True"
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: "yes"
-          install-features: "odl-jolokia,odl-netvirt-openstack"
-
-    functionality:
-      - upstream-stateful
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-      - gate-stateful
-      - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-      - gate-minimal-cluster:
-          testplan: "{project}-{topology}-minimal-openstack.txt"
-      - dcgw:
-          testplan: "{project}-{topology}-dcgw-openstack.txt"
-          tools_system_count: 3
-          enable-gre-type-driver: "yes"
-      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - gate-tdd-wip:
-          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
-          tools_system_count: 3
-          enable-gre-type-driver: "yes"
-      - tempest-stateful:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-      - tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-      - 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-openstack-integration-aluminium-stein
-    jobs:
-      - inttest-csit-openstack-custom
-
-    # temporarily disabling Stein jobs
-    disable-job: true
-    project: "netvirt"
-    stream: "aluminium"
-    branch: "stable/aluminium"
-    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
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-      - gate-stateful
-      - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-      - gate-minimal-cluster:
-          testplan: "{project}-{topology}-minimal-openstack.txt"
-      - dcgw:
-          testplan: "{project}-{topology}-dcgw-openstack.txt"
-          tools_system_count: 3
-          enable-gre-type-driver: "yes"
-      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - gate-tdd-wip:
-          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
-          tools_system_count: 3
-          enable-gre-type-driver: "yes"
-      - tempest-stateful:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-      - tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-      - 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-master
     jobs:
index 0f2916d2fcee208cde28d9683025a58e73860567..bbd07554f2a90395039fe36ecce0f4a734806b39 100644 (file)
@@ -10,9 +10,6 @@
       - master:
           branch: "master"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "rocky"
 
index 7df76be2bf6d8f69622b93b7112d0173bcfc889d..562b3e069fcc814a2d699c9cb7528ae581fd0fce 100644 (file)
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
 
-- project:
-    name: netvirt-aluminium
-    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: aluminium
-    branch: "stable/aluminium"
-
-    project: "netvirt"
-    project-name: "netvirt"
-
-    java-version: "openjdk11"
-    mvn-settings: "netvirt-settings"
-    mvn-opts: "-Xmx2048m"
-    build-timeout: 90
-    build-node: centos7-builder-8c-8g
-    dependencies: >
-      genius-merge-{stream},
-      neutron-merge-{stream},
-      openflowjava-merge-{stream},
-      openflowplugin-merge-{stream},
-      ovsdb-merge-{stream}
-    email-upstream:
-      "[genius] [netvirt] [neutron] [openflowjava] [openflowplugin]\
-      \ [ovsdb]"
-
-    # Used by the release job
-    staging-profile-id: a67da0ffbb1ba
-
 - project:
     name: netvirt-sonar
     jobs:
index 47c112752c656497a3f29a4308cc3cc9c74fca32..57df5370a9168122878eb81de7cb14a518b118bc 100644 (file)
@@ -13,8 +13,6 @@
           branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     os-branch: "queens"
 
index 61c05a2e37af821e564627c02458e75722bd931b..c001f8b7f1fbc04059616e1243c2d65c22d4d4c8 100644 (file)
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
-- project:
-    name: neutron-aluminium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "neutron"
-    project-name: "neutron"
-    build-timeout: 90
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "neutron-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
-    email-upstream: "[neutron] [odlparent] [aaa]"
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
 - project:
     name: neutron-sonar
     jobs:
index 63bcb300dc926884dea7ec2a440d9d792b21cd6e..505a3947d3f2300d85a5ce0f90f3788ef73c3d4f 100644 (file)
             -e ODLMICRO_IGN
             -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
             -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-          functionality: "netconf"
-          robot-options: >
-            -e ODLMICRO_IGN
-            -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT
-            -v NETCONF_TESTTOOL_VERSION:1.9.2-SNAPSHOT
 
     install:
       - manual:
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-          functionality: "netconf-devices-scale"
-          robot-options: >
-            -e ODLMICRO_IGN
-            -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT
-            -v NETCONF_TESTTOOL_VERSION:1.9.2-SNAPSHOT
-            -v USE_NETCONF_CONNECTOR:False
-            -v SCHEMA_MODEL:juniper
-            -v INIT_DEVICE_COUNT:5000
-            -v SCALE_TESTS:TRUE
     install:
       - manual:
           scope: "test"
             -v SCHEMA_MODEL:juniper
             -v INIT_DEVICE_COUNT:400
             -v SCALE_TESTS:TRUE
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-          functionality: "netconf-general-scale"
-          robot-options: >
-            -e ODLMICRO_IGN
-            -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT
-            -v NETCONF_TESTTOOL_VERSION:1.9.2-SNAPSHOT
-            -v USE_NETCONF_CONNECTOR:False
-            -v SCHEMA_MODEL:juniper
-            -v INIT_DEVICE_COUNT:5000
-            -v SCALE_TESTS:TRUE
     install:
       - manual:
           scope: "test"
index f649de10fa45413b839d4c56613faa3ff0db6791..ec132bdced2bec4702e031c2c6cac04ec51a4d7c 100644 (file)
     # Used by the release job
     staging-profile-id: 44ce67428fd0d
 
-- project:
-    name: odlmicro-aluminium
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: odlmicro
-    project-name: "odlmicro"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    build-node: centos7-builder-2c-2g
-    build-timeout: 60
-    mvn-settings: "odlmicro-settings"
-    mvn-opts: "-Xmx2048m"
-
-    # Used by the release job
-    staging-profile-id: 44ce67428fd0d
-
 - project:
     name: odlmicro-release-management
     jobs:
index 2c3e869122fec7e0c071b544bed6119f21f812f1..c03d622a88d88ea951bb3b64c823928776bf517c 100644 (file)
@@ -13,8 +13,6 @@
           branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     os-branch: "queens"
 
index fdc196aa615e44ab2674aed32d384b47e11c8ba7..d8614e6549bf9993b9e41aa99a6ce7bb94a78e5f 100644 (file)
     # Used by the release job
     staging-profile-id: 2802f0e38ee665
 
-- project:
-    name: odlsaf-aluminium
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "odlsaf"
-    project-name: "odlsaf"
-    build-node: centos7-builder-4c-4g
-    build-timeout: 120
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "odlsaf-settings"
-    mvn-opts: "-Xmx2048m"
-    email-upstream: "[app-dev]"
-
-    # Used by the release job
-    staging-profile-id: 2802f0e38ee665
-
 - project:
     name: odlsaf-release-management
     jobs:
index 55f28bc2b244e4a2c574d5cfa8b08e15b6d428d7..83c6fa45f39e0ec6879245840789949762c464da 100644 (file)
@@ -19,9 +19,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     functionality:
       - "upstream"
index 98bb1619fd3a15028a14a6f6db76e94ce6029346..ace2a005a26e90a7885f6ab2ba0d741f9ff26dea 100644 (file)
@@ -14,8 +14,6 @@
           branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     feature:
       - current:
index 83c30e9196fc57ead67e82cc77f11e23ccc70bcb..41356693b6d95476019c527af4ec69439f7729d3 100644 (file)
@@ -13,8 +13,6 @@
     stream:
       - silicon:
           branch: "master"
-      - aluminium:
-          branch: "stable/aluminium"
 
     project: odltools
     project-name: odltools
index b89ff1e0d69377070c5d7ef4387ab0ef688b2bbf..89b61017919e78d461410d16d9a0c00f4a2d9ed5 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 95abb00bca01af703c0a9afd2cf6f1a154ff14a4..3e6f8ab07d10576e4b896dd09bd26193a90553cd 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index ffe8551fbd619a0237723eddc8267f224b8cecdf..72ea2dec353ebedd15d5925a4979eb38e97a2c7e 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index c68d5996112a8f5e805bcbc94c43758eb1b3fe8a..2c96b68e1ed064eb09eacf8687194ba4b69cddf7 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 442feb4381ba44904c68c6364009ba315242bf10..b1b92d5b5537ffda4640684bf6702946612c06d1 100644 (file)
           branch: "stable/silicon"
           jre: "openjdk11"
           install: "all"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-          install: "all"
 
     # Features to install
     install-features: >
index 594d4efecefe017644b139f5f54f6cc327b59d98..3691ceb66b109da27640ec00c1f99deb26d55ce8 100644 (file)
@@ -25,9 +25,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 3f91d3d6e959b5c8f292680eae54a145045357ba..3c9536a32207535f4cd935f5113f4a12fd74319a 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 793c268254eb1c767937a29917fb6a1f92fe784d..6876ce0f9e444e167cf69e3f0ee076aa30a2e1d0 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 352a9d04f40ee6e7c7da16f2b309585322b81155..6e2214cb088679a3f1628c3adde493b5f729108d 100644 (file)
@@ -22,9 +22,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index e01b5a988af623f5734339cef15fbe1ba30c66b3..3f482ea4297c5486d62642654708e03e16a2d91f 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 1d81ea8ccb7b838974d1a14c12b0ac3f24bc325c..02faaff4cc5c70dad6d8236ede213bda647d9c73 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index b146ead86aa268fc494648c49b362ce351dfc26a..beeb2a5fbf07272ac60de05996a518d96ee4366c 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 5baebd08922a5da109dc123b42e9cf21520e9444..403ef0953ac63deb430c543c950b062bfb625d66 100644 (file)
@@ -18,9 +18,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"
index e924c905f5b3f8c416a35505ec8ac2cf60260614..3f79455681117996eb4a05f831cba4694dbc2c7e 100644 (file)
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-aluminium
-    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: aluminium
-    project: "openflowplugin"
-    project-name: "openflowplugin"
-    branch: "stable/aluminium"
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    java-version: "openjdk11"
-    mvn-settings: "openflowplugin-settings"
-    mvn-goals: "clean deploy javadoc:aggregate"
-    mvn-opts: "-Xmx1024m"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      openflowjava-merge-{stream}
-    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"
-    # Used by the release job
-    staging-profile-id: a68a76dc1b44c
-
 - project:
     name: openflowplugin-sonar
     jobs:
index 488c44195c862e8e2bbffb80039067ee40e78049..528aa400f4c6e21a57ccc3f376500d1fb303ab7c 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 8c6829dce55246d4a2d59639707d4617c308ef7c..ea353fb7e18f878292493a2150ca18d6ec068222 100644 (file)
@@ -23,9 +23,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 4c5a59869ef85f1d89f3ec208b4806585edaadc2..1953d9222aed9f17a79a6376f3aeb9b72973079f 100644 (file)
@@ -14,9 +14,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     project: "ovsdb"
     archive-artifacts: "*.log"
index 7dd533c8977a7f7ae678dadb473d0f7aa366fab2..eef2ef960bd91b693e0129350c24cc797462ef01 100644 (file)
@@ -17,9 +17,6 @@
       - silicon:
           branch: "stable/silicon"
           java-version: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          java-version: "openjdk11"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 094b331fcecf8cf2b2f2b2ab7bf749255cc4e952..98aa86d77dca687aef7f961f6a373b8ef1738904 100644 (file)
     # Used by the release job
     staging-profile-id: a68b188166958
 
-- project:
-    name: ovsdb-aluminium
-    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: aluminium
-    project: "ovsdb"
-    project-name: "ovsdb"
-    branch: "stable/aluminium"
-    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-sonar
     jobs:
index 769d2791912566710b250eb5a614409d75fd3f96..cdee1905f08606636655fcc7fe40964ec737a8b5 100644 (file)
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
-- project:
-    name: p4plugin-aluminium
-    jobs:
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: aluminium
-    project: "p4plugin"
-    project-name: "p4plugin"
-    branch: "stable/aluminium"
-    mvn-settings: "p4plugin-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: ""
-    email-upstream: "[p4plugin]"
-
-    # Used by the release job
-    staging-profile-id: a68bf26e208d4
-
 - project:
     name: p4plugin-release-management
     jobs:
index ceacfd0e7732f0e23f210282c0f96b2947b7af6c..a10f2e114a09f531d1018fe88360377a8ee5b4f3 100644 (file)
@@ -13,8 +13,6 @@
           branch: "stable/phosphorus"
       - silicon:
           branch: "stable/silicon"
-      - aluminium:
-          branch: "stable/aluminium"
 
     os-branch: "queens"
     jdk: "openjdk8"
index 91e4af944b4fd3e93bbcd8a91845d50a3244b1e4..dd5998ad6c7105f9e1846d8fa6382866597078c6 100644 (file)
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
-- project:
-    name: serviceutils-aluminium
-    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/aluminium"
-    stream: aluminium
-
-    project: "serviceutils"
-    project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
-    java-version: "openjdk11"
-    mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
-    build-timeout: 90
-    dependencies: >
-      controller-merge-{stream},
-      yangtools-merge-{stream},
-      odlparent-merge-{stream},
-      infrautils-merge-{stream}
-    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-    # Used by the release job
-    staging-profile-id: 12cc4ba8bf01ba
-
 - project:
     name: serviceutils-sonar
     jobs:
index b7164740e71720bc017b63d0903ea947e4bfb8a3..63e4fcecfbcd6674f6581abea648a257a497f236 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - all:
index 24c8c8e1e735f90592f50e24820c831423570fa7..b377c29f3dd35e5cd55cf94212421ef3af4b6dc3 100644 (file)
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-aluminium
-    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: 240
-          build-node: centos7-builder-4c-16g
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: "transportpce"
-    project-name: "transportpce"
-    stream: aluminium
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
-    mvn-settings: "transportpce-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[transportpce] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: a6927323fa3d4
-
 - project:
     name: transportpce-release-management
     jobs:
index 28752cde1b3e0b3a18ff5053c4c00694f1d407f0..c47acfd1ddb1ec981bc4f687c9ebe6b8cff508ef 100644 (file)
@@ -21,9 +21,6 @@
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
 
     install:
       - only:
index 18fca33755d71ed03c6ce4daadd0d8bd9db5f15f..ea488023f069545658e62191f43ab697a0db0992 100644 (file)
@@ -16,9 +16,6 @@
       - silicon:
           branch: "6.0.x"
           jre: "openjdk11"
-      - aluminium:
-          branch: "5.0.x"
-          jre: "openjdk11"
 
     feature:
       - core:
index a1c813ae57a208819d50489663fc6acce1a43550..88cf3cb97817b6574da19dbac5655177d6fc95ff 100755 (executable)
@@ -346,7 +346,7 @@ parser.add_argument(
     metavar="RELEASE_ON_CURRENT_BRANCH",
     type=str,
     help="""The ODL release codename for the new {}
-        (eg. Aluminium, Silicon).""".format(
+        (eg. Silicon, Phosphorus).""".format(
         default_branch
     ),
 )