From 753ab67a9e464c45f6d83feaa06b5a4fa697293e Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 5 Oct 2021 12:58:34 +1000 Subject: [PATCH] Feat!: Remove all stable/aluminium jobs 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 Change-Id: I5c8ca9a5a258caa853537107e996f6eb169d3b4b --- jjb/aaa/aaa-csit-authn.yaml | 3 - jjb/aaa/aaa-patch-test.yaml | 3 - jjb/aaa/aaa.yaml | 25 --- jjb/archetypes/archetypes.yaml | 18 -- jjb/autorelease/autorelease-projects.yaml | 3 - jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 - .../validate-autorelease-aluminium.yaml | 35 ---- .../view-autorelease-aluminium.yaml | 38 ---- 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 | 31 ---- 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/daexim/daexim-csit-basic.yaml | 3 - jjb/daexim/daexim-csit-clustering-basic.yaml | 3 - jjb/daexim/daexim.yaml | 25 --- jjb/defaults.yaml | 27 +-- jjb/dluxapps/dluxapps-csit-yangman.yaml | 3 - jjb/docs/docs-rtd.yaml | 2 - jjb/docs/docs-template.yaml | 2 +- jjb/docs/docs_version_bump.sh | 2 +- 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/infrautils/infrautils-patch-test.yaml | 3 - jjb/infrautils/infrautils.yaml | 25 --- jjb/integration/csit-jobs-aluminium.lst | 54 ------ .../distribution-csit-userfeatures.yaml | 3 - .../distribution/distribution-jobs.yaml | 23 --- 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 - .../lispflowmapping-csit-msmr.yaml | 3 - jjb/lispflowmapping/lispflowmapping.yaml | 32 ---- jjb/mdsal/mdsal-csit-bindingv1.yaml | 3 - jjb/mdsal/mdsal-csit-netty-replication.yaml | 9 - jjb/mdsal/mdsal-patch-test.yaml | 3 - jjb/netconf/netconf-clustering-scale.yaml | 3 - jjb/netconf/netconf-clustering.yaml | 3 - jjb/netconf/netconf-csit-callhome.yaml | 3 - .../netconf-distribution-mri-test.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 | 49 ------ .../netvirt-csit-multi-openstack-upgrade.yaml | 135 --------------- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 162 ------------------ 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/odlmicro/odlmicro-csit.yaml | 32 ---- jjb/odlmicro/odlmicro.yaml | 19 -- jjb/odlparent/odlparent-patch-test.yaml | 2 - jjb/odlsaf/odlsaf.yaml | 20 --- jjb/odltools/odltools-csit.yaml | 3 - jjb/odltools/odltools-patch-test.yaml | 2 - jjb/odltools/odltools.yaml | 2 - .../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 | 33 ---- jjb/ovsdb/ovsdb-csit-clustering.yaml | 3 - jjb/ovsdb/ovsdb-csit-southbound.yaml | 3 - jjb/ovsdb/ovsdb-full-integration.yaml | 3 - jjb/ovsdb/ovsdb-patch-test.yaml | 3 - jjb/ovsdb/ovsdb.yaml | 27 --- jjb/p4plugin/p4plugin.yaml | 19 -- jjb/serviceutils/serviceutils-patch-test.yaml | 2 - jjb/serviceutils/serviceutils.yaml | 32 ---- jjb/sxp/sxp-csit-topology.yaml | 3 - jjb/transportpce/transportpce.yaml | 27 --- jjb/yangtools/yangtools-csit-system.yaml | 3 - jjb/yangtools/yangtools-patch-test.yaml | 3 - scripts/cut-branch-jobs.py | 2 +- 109 files changed, 7 insertions(+), 1305 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-aluminium.yaml delete mode 100644 jjb/autorelease/view-autorelease-aluminium.yaml delete mode 100644 jjb/integration/csit-jobs-aluminium.lst delete mode 100644 jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 51ff7cdec..47ea576f4 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -22,9 +22,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 96f547491..8917abc17 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -16,9 +16,6 @@ - silicon: branch: "stable/silicon" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" os-branch: "queens" diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 40eab4505..661b74e5b 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -47,31 +47,6 @@ # 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: diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 185b64888..fef79a6f7 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-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: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 634981da0..2099daf2b 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -22,9 +22,6 @@ - silicon: branch: "stable/silicon" integration-test: silicon - - aluminium: - branch: "stable/aluminium" - integration-test: aluminium project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index f8959dd2e..73071418c 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. Aluminium-SR2, Silicon-SR1 ... + Eg. Silicon-SR1, Phosphorus-SR2 ... 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 1fbc9cb0f..bd9d0ae78 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -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 index faed8ebbc..000000000 --- a/jjb/autorelease/validate-autorelease-aluminium.yaml +++ /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 index 630ef6890..000000000 --- a/jjb/autorelease/view-autorelease-aluminium.yaml +++ /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 diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 4d8ca3e3c..2f97fe850 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 2e516db3d..37851551e 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -22,9 +22,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 7157b9fe6..94ef8475e 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index d79d3f570..ab916a36b 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -24,9 +24,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 36866c197..deb75fafd 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index acd6b40e4..a8ec64e00 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 2b653c48e..d34ffae52 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 9702222e5..e15aa9353 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -18,9 +18,6 @@ - silicon: branch: "stable/silicon" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" feature: - bgp: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 2eeefc936..560e8c1e0 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -60,37 +60,6 @@ # 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: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 7d5f7eba8..92965a89a 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -20,9 +20,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index ec33db831..e3e9e9a27 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - 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 f35e89082..784254de6 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -24,9 +24,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index a3d1ba7e9..49f9c205f 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -24,9 +24,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - 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 0587e79e2..8dfe6fece 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 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index b75ffd58b..6265325ae 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -24,9 +24,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 378850030..8bf68eb95 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -24,9 +24,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index aa88ab063..194841563 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -24,9 +24,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index fb4ed988a..daaef5d25 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 9368e149d..0b4444bd0 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - 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 fd463c516..c2858adcd 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - 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 54d18d540..5b5273306 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 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 46656a77e..3caa4d9d2 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -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" diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 209f583fc..a6b016cb2 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 08b64df75..fd290fbe3 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 0a4e37c5b..377dab05c 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-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: diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index b09ced73f..be081b883 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -125,9 +125,9 @@ # 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 @@ -232,23 +232,9 @@ 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, @@ -258,15 +244,6 @@ 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, diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 6183c161b..4f736eebb 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index b2e86ef0b..56c4ad9ac 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - - aluminium: - branch: "stable/aluminium" project: docs project-name: docs diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml index b700ec0ea..d0d42157b 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: Aluminium, Silicon." + description: "The next release name eg: Silicon, Phosphorus." - bool: name: PUBLISH default: false diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh index 50bc1c9e3..fd9b06586 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 eg: Aluminium, Silicon." + echo " RELEASE_NAME: The RELEASE_NAME eg: Silicon, Phosphorus." echo " PUBLISH: Set to true to PUBLISH" echo "" } diff --git a/jjb/docs/docs_version_bump_projects.sh b/jjb/docs/docs_version_bump_projects.sh index defda6d63..b92a64808 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 Aluminium, Silicon." + echo " release_name: The release_name e.g Silicon, Phosphorus." 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 4eac39299..833637361 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -19,9 +19,6 @@ - master: branch: "master" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 54e2cb182..6e3f8f552 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -10,9 +10,6 @@ - master: branch: "master" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" os-branch: "rocky" diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index ea5d8dc85..ee4fad157 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -32,41 +32,6 @@ # 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: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index e56e68159..0a80ac274 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -16,9 +16,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index bdfede3dd..e2fdb5447 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -47,31 +47,6 @@ # 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 index f4ca504b7..000000000 --- a/jjb/integration/csit-jobs-aluminium.lst +++ /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, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 459ccb73a..8a7d036f9 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -15,9 +15,6 @@ - silicon: branch: "master" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 5f0878d93..37083f18b 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -30,8 +30,6 @@ branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - - aluminium: - branch: "stable/aluminium" - project: name: distribution-managed @@ -93,21 +91,6 @@ 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 @@ -142,10 +125,6 @@ branch: "stable/silicon" dependencies: > distribution-merge-managed-{stream}, - - aluminium: - branch: "stable/aluminium" - dependencies: > - distribution-merge-managed-{stream}, - project: name: distribution-release @@ -172,8 +151,6 @@ branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - - aluminium: - branch: "stable/aluminium" - project: name: distribution-sonar diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 63595dedd..57d1c586e 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -49,16 +49,6 @@ 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 @@ -110,22 +100,6 @@ 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 @@ -147,10 +121,6 @@ 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" diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 910d7c468..697fccb93 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 7880527bd..39aec0c4f 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-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: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index aa00faa35..916f0494d 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -22,9 +22,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 78996a18c..4d7482a3c 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -22,9 +22,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 1beea9b9e..6ed3621c7 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index c4f39c077..4d8313801 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -19,9 +19,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" os-branch: "queens" diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 5121ae3f6..7b40eea2f 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index d2c3f3bd1..21d89fbe3 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-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: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 9e993e4c3..d0a5a4dbd 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index 79da29316..457461772 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -39,15 +39,6 @@ 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: diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index a298aba69..b405266f1 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -16,9 +16,6 @@ - silicon: branch: "stable/silicon" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" os-branch: "queens" diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 49e5a8164..aa4f502dc 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -18,9 +18,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" karaf-version: netconf diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index cdc0e1a05..2c2fd9bbc 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -18,9 +18,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" karaf-version: netconf diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 7f3dd75af..952e03c8f 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -20,9 +20,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" karaf-version: netconf diff --git a/jjb/netconf/netconf-distribution-mri-test.yaml b/jjb/netconf/netconf-distribution-mri-test.yaml index de768e63f..016cf13c1 100644 --- a/jjb/netconf/netconf-distribution-mri-test.yaml +++ b/jjb/netconf/netconf-distribution-mri-test.yaml @@ -13,9 +13,6 @@ - silicon: branch: "stable/silicon" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" os-branch: "queens" diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index 5dbe246fa..1b8bdc648 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -13,9 +13,6 @@ - silicon: branch: "stable/silicon" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" os-branch: "queens" diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 0ce1f2940..84eede89a 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -18,9 +18,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" karaf-version: netconf @@ -75,13 +72,6 @@ "-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 diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 1bf4193a7..d8bfeb02f 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -24,9 +24,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" karaf-version: netconf diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index e4f7cab67..db43ae95c 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -53,34 +53,6 @@ # 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: diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index c13362701..7da5ac97e 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -95,52 +95,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-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 index 24b0e067d..000000000 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ /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}" diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 8f24005bb..461b07895 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -160,168 +160,6 @@ 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: diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 0f2916d2f..bbd07554f 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -10,9 +10,6 @@ - master: branch: "master" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" os-branch: "rocky" diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 7df76be2b..562b3e069 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -37,45 +37,6 @@ # 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: diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 47c112752..57df5370a 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -13,8 +13,6 @@ branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - - aluminium: - branch: "stable/aluminium" os-branch: "queens" diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 61c05a2e3..c001f8b7f 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -42,28 +42,6 @@ # 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: diff --git a/jjb/odlmicro/odlmicro-csit.yaml b/jjb/odlmicro/odlmicro-csit.yaml index 63bcb300d..505a3947d 100644 --- a/jjb/odlmicro/odlmicro-csit.yaml +++ b/jjb/odlmicro/odlmicro-csit.yaml @@ -37,14 +37,6 @@ -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: @@ -103,18 +95,6 @@ -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" @@ -181,18 +161,6 @@ -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" diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml index f649de10f..ec132bdce 100644 --- a/jjb/odlmicro/odlmicro.yaml +++ b/jjb/odlmicro/odlmicro.yaml @@ -56,25 +56,6 @@ # 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: diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index 2c3e86912..c03d622a8 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -13,8 +13,6 @@ branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - - aluminium: - branch: "stable/aluminium" os-branch: "queens" diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml index fdc196aa6..d8614e654 100644 --- a/jjb/odlsaf/odlsaf.yaml +++ b/jjb/odlsaf/odlsaf.yaml @@ -59,26 +59,6 @@ # 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: diff --git a/jjb/odltools/odltools-csit.yaml b/jjb/odltools/odltools-csit.yaml index 55f28bc2b..83c6fa45f 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -19,9 +19,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" functionality: - "upstream" diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml index 98bb1619f..ace2a005a 100644 --- a/jjb/odltools/odltools-patch-test.yaml +++ b/jjb/odltools/odltools-patch-test.yaml @@ -14,8 +14,6 @@ branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - - aluminium: - branch: "stable/aluminium" feature: - current: diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index 83c30e919..41356693b 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -13,8 +13,6 @@ stream: - silicon: branch: "master" - - aluminium: - branch: "stable/aluminium" project: odltools project-name: odltools diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index b89ff1e0d..89b610179 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 95abb00bc..3e6f8ab07 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - 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 ffe8551fb..72ea2dec3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index c68d59961..2c96b68e1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 442feb438..b1b92d5b5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -26,10 +26,6 @@ branch: "stable/silicon" jre: "openjdk11" install: "all" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" - install: "all" # Features to install install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 594d4efec..3691ceb66 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -25,9 +25,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 3f91d3d6e..3c9536a32 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - 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 793c26825..6876ce0f9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 352a9d04f..6e2214cb0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -22,9 +22,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index e01b5a988..3f482ea42 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 1d81ea8cc..02faaff4c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index b146ead86..beeb2a5fb 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 5baebd089..403ef0953 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -18,9 +18,6 @@ - silicon: branch: "stable/silicon" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index e924c905f..3f7945568 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -96,39 +96,6 @@ # 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: diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 488c44195..528aa400f 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 8c6829dce..ea353fb7e 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -23,9 +23,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 4c5a59869..1953d9222 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -14,9 +14,6 @@ - silicon: branch: "stable/silicon" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" project: "ovsdb" archive-artifacts: "*.log" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 7dd533c89..eef2ef960 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -17,9 +17,6 @@ - silicon: branch: "stable/silicon" java-version: "openjdk11" - - aluminium: - branch: "stable/aluminium" - java-version: "openjdk11" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 094b331fc..98aa86d77 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -78,33 +78,6 @@ # 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: diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 769d27919..cdee1905f 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-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: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index ceacfd0e7..a10f2e114 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -13,8 +13,6 @@ branch: "stable/phosphorus" - silicon: branch: "stable/silicon" - - aluminium: - branch: "stable/aluminium" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 91e4af944..dd5998ad6 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -95,38 +95,6 @@ # 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: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index b7164740e..63e4fcecf 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - all: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 24c8c8e1e..b377c29f3 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -82,33 +82,6 @@ # 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: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 28752cde1..c47acfd1d 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -21,9 +21,6 @@ - silicon: branch: "stable/silicon" jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" install: - only: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 18fca3375..ea488023f 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -16,9 +16,6 @@ - silicon: branch: "6.0.x" jre: "openjdk11" - - aluminium: - branch: "5.0.x" - jre: "openjdk11" feature: - core: diff --git a/scripts/cut-branch-jobs.py b/scripts/cut-branch-jobs.py index a1c813ae5..88cf3cb97 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. Aluminium, Silicon).""".format( + (eg. Silicon, Phosphorus).""".format( default_branch ), ) -- 2.36.6