From b49a27745d0dcaf0b46b47949c2bcc4647f17e39 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Fri, 13 May 2022 17:42:32 +1000 Subject: [PATCH] CI!: Rm silicon jobs from Jenkins Silicon is EOL. All silicon jobs will be removed from Jenkins CI since Sulfur is released. Change-Id: Ifb2c5cd93b42614f1b01621f293c5ad21a1679a1 Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 3 - jjb/archetypes/archetypes.yaml | 18 --- jjb/autorelease/autorelease-branch-lock.yaml | 2 - jjb/autorelease/autorelease-projects.yaml | 3 - jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 - .../validate-autorelease-silicon.yaml | 27 ----- jjb/autorelease/view-autorelease-silicon.yaml | 34 ------ 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.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/daexim/daexim-csit-basic.yaml | 3 - jjb/daexim/daexim-csit-clustering-basic.yaml | 3 - jjb/daexim/daexim.yaml | 25 ----- jjb/defaults.yaml | 104 ++++++++---------- 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 | 6 +- jjb/docs/docs_version_bump_projects.sh | 4 +- jjb/integration/csit-jobs-silicon.lst | 22 ---- .../distribution/distribution-jobs.yaml | 24 ---- jjb/integration/integration-test-jobs.yaml | 27 ----- 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 - .../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/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-scale.yaml | 10 -- jjb/netconf/netconf-userfeatures.yaml | 3 - jjb/neutron/neutron-patch-test.yaml | 3 - jjb/neutron/neutron.yaml | 22 ---- jjb/odlmicro/odlmicro-csit.yaml | 32 ------ jjb/odlmicro/odlmicro.yaml | 19 ---- jjb/odlsaf/odlsaf.yaml | 20 ---- jjb/odltools/odltools-csit.yaml | 3 - .../openflowplugin-csit-cbench.yaml | 3 - ...flowplugin-csit-clustering-bulkomatic.yaml | 3 - ...lugin-csit-clustering-perf-bulkomatic.yaml | 3 - .../openflowplugin-csit-clustering.yaml | 3 - .../openflowplugin-csit-flow-services.yaml | 4 - .../openflowplugin-csit-longevity.yaml | 3 - .../openflowplugin-csit-perf-bulkomatic.yaml | 3 - ...flowplugin-csit-perf-stats-collection.yaml | 3 - .../openflowplugin-csit-sanity.yaml | 3 - .../openflowplugin-csit-scale-link.yaml | 3 - .../openflowplugin-csit-scale-switch.yaml | 3 - .../openflowplugin-csit-scale.yaml | 3 - .../openflowplugin-patch-test.yaml | 4 - 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 | 4 - jjb/ovsdb/ovsdb.yaml | 27 ----- jjb/p4plugin/p4plugin.yaml | 19 ---- jjb/packaging/helm.yaml | 8 +- jjb/packaging/packaging.yaml | 2 - jjb/serviceutils/serviceutils-patch-test.yaml | 3 - jjb/serviceutils/serviceutils.yaml | 32 ------ jjb/sxp/sxp-csit-topology.yaml | 3 - jjb/transportpce/transportpce.yaml | 27 ----- jjb/yangtools/yangtools-csit-system.yaml | 3 - scripts/cut-branch-jobs.py | 8 +- 89 files changed, 63 insertions(+), 768 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-silicon.yaml delete mode 100644 jjb/autorelease/view-autorelease-silicon.yaml delete mode 100644 jjb/integration/csit-jobs-silicon.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index a50867cd2c..b4c289f728 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -22,9 +22,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - all: diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 5d8544ff08..6e203b1e4a 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-silicon - jobs: - - odl-maven-jobs-jdk11 - - odl-maven-verify-jobs - - stream: silicon - project: "archetypes" - project-name: "archetypes" - branch: "stable/silicon" - 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-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml index 7d81e12dc3..1daa333d12 100644 --- a/jjb/autorelease/autorelease-branch-lock.yaml +++ b/jjb/autorelease/autorelease-branch-lock.yaml @@ -94,5 +94,3 @@ branch: "stable/sulfur" - phosphorus: branch: "stable/phosphorus" - - silicon: - branch: "stable/silicon" diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index eace26248b..fd60982114 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -22,9 +22,6 @@ - phosphorus: branch: "stable/phosphorus" integration-test: phosphorus - - silicon: - branch: "stable/silicon" - integration-test: silicon project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index df731482a1..5e05e77878 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. Silicon-SR1, Phosphorus-SR2 ... + Eg. Sulfur-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 ca12adcdc6..2a5dbdcd81 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -17,5 +17,3 @@ branch: "stable/sulfur" - phosphorus: branch: "stable/phosphorus" - - silicon: - branch: "stable/silicon" diff --git a/jjb/autorelease/validate-autorelease-silicon.yaml b/jjb/autorelease/validate-autorelease-silicon.yaml deleted file mode 100644 index be49e91514..0000000000 --- a/jjb/autorelease/validate-autorelease-silicon.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-silicon - jobs: - - "{project-name}-validate-autorelease-{stream}" - stream: silicon - branch: stable/silicon - project-name: - - bgpcep: - project: bgpcep - - daexim: - project: daexim - - integration-distribution: - project: integration/distribution - - jsonrpc: - project: jsonrpc - - lispflowmapping: - project: lispflowmapping - - neutron: - project: neutron - - openflowplugin: - project: openflowplugin - - ovsdb: - project: ovsdb - - serviceutils: - project: serviceutils diff --git a/jjb/autorelease/view-autorelease-silicon.yaml b/jjb/autorelease/view-autorelease-silicon.yaml deleted file mode 100644 index d8bc77b982..0000000000 --- a/jjb/autorelease/view-autorelease-silicon.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job -- releng_view: &releng_autorelease_view_common_silicon - name: releng-view-autorelease-silicon - 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-Silicon - description: "List of Silicon Merge jobs for Autorelease" - job-name: - - "bgpcep-maven-merge-silicon" - - "daexim-maven-merge-silicon" - - "integration/distribution-maven-merge-silicon" - - "jsonrpc-maven-merge-silicon" - - "lispflowmapping-maven-merge-silicon" - - "neutron-maven-merge-silicon" - - "openflowplugin-maven-merge-silicon" - - "ovsdb-maven-merge-silicon" - - "serviceutils-maven-merge-silicon" - <<: *releng_autorelease_view_common_silicon diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 46df826963..1cfa488164 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 41535e56cc..c04a885064 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -22,9 +22,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 6d3fed52c9..e8b5aa915e 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 04e1733521..af02fab205 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -24,9 +24,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 452b208158..9fe5367055 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index c1b793d793..d886bb9de3 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index af305f57a2..5f527c601c 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: bgpcep diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 6f43ea3e91..12a43f3347 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -63,37 +63,6 @@ # Used by the release job staging-profile-id: 9427a05049030 -- project: - name: bgpcep-silicon - 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: silicon - project: "bgpcep" - project-name: "bgpcep" - build-node: centos7-builder-8c-8g - build-timeout: 120 - branch: "stable/silicon" - 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 839f983c09..b8d2090191 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -20,9 +20,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 8c5aad9df3..4a8004b2c4 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - 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 7b1a5799fe..044500ff13 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -24,9 +24,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 3ea5e77adf..91f89ef03e 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -24,9 +24,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - 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 da45b1c4cf..f161874779 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 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index bf279e55b0..4c24fc9792 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -24,9 +24,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 91cbfcea39..4c8c6386f6 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -24,9 +24,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 3ff6efb0ab..41148d3d36 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -24,9 +24,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index fef29c4cf1..4b29eff720 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 7ed846e688..9ff94cc4cf 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - 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 126207535d..5ea8e95370 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - 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 c08b0e2ad5..eec65ba65e 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 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 3e4a6de677..318fd12c19 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 43809ca61d..c5458e0348 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 852efcddd7..3b896884dd 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -78,31 +78,6 @@ # Used by the release job staging-profile-id: 96e4dade34bd7 -- project: - name: daexim-silicon - 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: silicon - branch: "stable/silicon" - 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 8fcde1b05a..af9a9437c4 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/silicon + verify-branch: stable/phosphorus # Value for ODL_STREAM - verify-stream: silicon + verify-stream: phosphorus verify-karaf-version: karaf4 verify-jdkversion: openjdk11 @@ -213,37 +213,6 @@ 10-exclude-value: "" # Manual CSIT job lists used by sanity or periodic in nature. - csit-mri-list-silicon: > - aaa-csit-1node-authn-all-silicon, - controller-csit-1node-akka1-all-silicon, - controller-csit-1node-benchmark-all-silicon, - controller-csit-1node-rest-cars-perf-all-silicon, - controller-csit-3node-benchmark-all-silicon, - controller-csit-3node-clustering-ask-all-silicon, - controller-csit-3node-clustering-tell-all-silicon, - controller-csit-3node-rest-clust-cars-perf-ask-only-silicon, - controller-csit-3node-rest-clust-cars-perf-tell-only-silicon, - mdsal-csit-3node-netty-replicate-only-silicon, - netconf-csit-1node-callhome-only-silicon, - netconf-csit-1node-scale-max-devices-only-silicon, - netconf-csit-1node-scale-only-silicon, - netconf-csit-1node-userfeatures-all-silicon, - netconf-csit-1node-userfeatures-rfc8040-all-silicon, - netconf-csit-3node-clustering-only-silicon, - netconf-csit-3node-clustering-scale-only-silicon, - yangtools-csit-1node-system-only-silicon - csit-sanity-list-silicon: > - openflowplugin-csit-1node-sanity-only-silicon, - distribution-sanity-silicon - csit-weekly-list-silicon: > - controller-csit-1node-notifications-longevity-only-silicon, - controller-csit-3node-drb-partnheal-longevity-only-silicon, - controller-csit-3node-drb-precedence-longevity-only-silicon, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-silicon, - bgpcep-csit-3node-bgpclustering-longevity-only-silicon, - distribution-deploy-silicon, - distribution-offline-silicon, - openflowplugin-csit-1node-longevity-only-silicon csit-mri-list-phosphorus: > aaa-csit-1node-authn-all-phosphorus, controller-csit-1node-akka1-all-phosphorus, @@ -277,39 +246,62 @@ distribution-sanity-phosphorus csit-mri-list-sulfur: > aaa-csit-1node-authn-all-sulfur, controller-csit-1node-akka1-all-sulfur, - controller-csit-1node-benchmark-all-sulfur, controller-csit-1node-rest-cars-perf-all-sulfur, + controller-csit-1node-benchmark-all-sulfur, + controller-csit-1node-rest-cars-perf-all-sulfur, controller-csit-3node-benchmark-all-sulfur, - controller-csit-3node-clustering-ask-all-sulfur, controller-csit-3node-clustering-tell-all-sulfur, + controller-csit-3node-clustering-ask-all-sulfur, + controller-csit-3node-clustering-tell-all-sulfur, controller-csit-3node-rest-clust-cars-perf-ask-only-sulfur, controller-csit-3node-rest-clust-cars-perf-tell-only-sulfur, - mdsal-csit-3node-netty-replicate-only-sulfur, netconf-csit-1node-callhome-only-master, - netconf-csit-1node-scale-max-devices-only-master, netconf-csit-1node-scale-only-master, - netconf-csit-1node-userfeatures-all-master, netconf-csit-1node-userfeatures-rfc8040-all-master, - netconf-csit-3node-clustering-only-master, netconf-csit-3node-clustering-scale-only-master, + mdsal-csit-3node-netty-replicate-only-sulfur, + netconf-csit-1node-callhome-only-master, + netconf-csit-1node-scale-max-devices-only-master, + netconf-csit-1node-scale-only-master, + netconf-csit-1node-userfeatures-all-master, + netconf-csit-1node-userfeatures-rfc8040-all-master, + netconf-csit-3node-clustering-only-master, + netconf-csit-3node-clustering-scale-only-master, yangtools-csit-1node-system-only-sulfur csit-weekly-list-sulfur: > controller-csit-1node-notifications-longevity-only-sulfur, controller-csit-3node-drb-partnheal-longevity-only-sulfur, controller-csit-3node-drb-precedence-longevity-only-sulfur, controller-csit-3node-ddb-expl-lead-movement-longevity-only-sulfur, - bgpcep-csit-3node-bgpclustering-longevity-only-sulfur, distribution-deploy-sulfur, - distribution-offline-sulfur, openflowplugin-csit-1node-longevity-only-sulfur + bgpcep-csit-3node-bgpclustering-longevity-only-sulfur, + distribution-deploy-sulfur, + distribution-offline-sulfur, + openflowplugin-csit-1node-longevity-only-sulfur csit-sanity-list-sulfur: > - openflowplugin-csit-1node-sanity-only-sulfur, distribution-sanity-sulfur + openflowplugin-csit-1node-sanity-only-sulfur, + distribution-sanity-sulfur csit-mri-list-chlorine: > - aaa-csit-1node-authn-all-chlorine, controller-csit-1node-akka1-all-chlorine, - controller-csit-1node-benchmark-all-chlorine, controller-csit-1node-rest-cars-perf-all-chlorine, - controller-csit-3node-benchmark-all-chlorine, controller-csit-3node-clustering-ask-all-chlorine, - controller-csit-3node-clustering-tell-all-chlorine, controller-csit-3node-rest-clust-cars-perf-ask-only-chlorine, - controller-csit-3node-rest-clust-cars-perf-tell-only-chlorine, mdsal-csit-3node-netty-replicate-only-chlorine, - netconf-csit-1node-callhome-only-master, netconf-csit-1node-scale-max-devices-only-master, - netconf-csit-1node-scale-only-master, netconf-csit-1node-userfeatures-all-master, - netconf-csit-1node-userfeatures-rfc8040-all-master, netconf-csit-3node-clustering-only-master, - netconf-csit-3node-clustering-scale-only-master, yangtools-csit-1node-system-only-chlorine + aaa-csit-1node-authn-all-chlorine, + controller-csit-1node-akka1-all-chlorine, + controller-csit-1node-benchmark-all-chlorine, + controller-csit-1node-rest-cars-perf-all-chlorine, + controller-csit-3node-benchmark-all-chlorine, + controller-csit-3node-clustering-ask-all-chlorine, + controller-csit-3node-clustering-tell-all-chlorine, + controller-csit-3node-rest-clust-cars-perf-ask-only-chlorine, + controller-csit-3node-rest-clust-cars-perf-tell-only-chlorine, + mdsal-csit-3node-netty-replicate-only-chlorine, + netconf-csit-1node-callhome-only-master, + netconf-csit-1node-scale-max-devices-only-master, + netconf-csit-1node-scale-only-master, + netconf-csit-1node-userfeatures-all-master, + netconf-csit-1node-userfeatures-rfc8040-all-master, + netconf-csit-3node-clustering-only-master, + netconf-csit-3node-clustering-scale-only-master, + yangtools-csit-1node-system-only-chlorine csit-weekly-list-chlorine: > - controller-csit-1node-notifications-longevity-only-chlorine, controller-csit-3node-drb-partnheal-longevity-only-chlorine, - controller-csit-3node-drb-precedence-longevity-only-chlorine, controller-csit-3node-ddb-expl-lead-movement-longevity-only-chlorine, - bgpcep-csit-3node-bgpclustering-longevity-only-chlorine, distribution-deploy-chlorine, - distribution-offline-chlorine, openflowplugin-csit-1node-longevity-only-chlorine + controller-csit-1node-notifications-longevity-only-chlorine, + controller-csit-3node-drb-partnheal-longevity-only-chlorine, + controller-csit-3node-drb-precedence-longevity-only-chlorine, + controller-csit-3node-ddb-expl-lead-movement-longevity-only-chlorine, + bgpcep-csit-3node-bgpclustering-longevity-only-chlorine, + distribution-deploy-chlorine, + distribution-offline-chlorine, + openflowplugin-csit-1node-longevity-only-chlorine csit-sanity-list-chlorine: > - openflowplugin-csit-1node-sanity-only-chlorine, distribution-sanity-chlorine + openflowplugin-csit-1node-sanity-only-chlorine, + distribution-sanity-chlorine diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index 40c3dad8af..4b8628d5ea 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - all: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 440844c240..0386032430 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: "stable/sulfur" - phosphorus: branch: "stable/phosphorus" - - silicon: - branch: "stable/silicon" project: docs project-name: docs diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml index d0d42157be..85edb6d9f0 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: Silicon, Phosphorus." + description: "The next release name eg: Sulfur, Phosphorus." - bool: name: PUBLISH default: false diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh index fd9b065866..90021ed03a 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: Silicon, Phosphorus." + echo " RELEASE_NAME: The RELEASE_NAME eg: Sulfur, Phosphorus." echo " PUBLISH: Set to true to PUBLISH" echo "" } @@ -36,11 +36,11 @@ pip install --quiet --upgrade "pip==9.0.3" setuptools pip install --quiet --upgrade git-review git config --global --add gitreview.username "jenkins-$SILO" cd "$WORKSPACE"/docs || exit -RELEASE_NAME=$RELEASE_NAME +RELEASE_NAME=${RELEASE_NAME:-} Next_release="$(tr '[:lower:]' '[:upper:]' <<< "${RELEASE_NAME:0:1}")${RELEASE_NAME:1}" # Captilize Version Name release_name=$STREAM Release_version="$(tr '[:lower:]' '[:upper:]' <<< "${release_name:0:1}")${release_name:1}" # Captilize Version Name -PUBLISH=$PUBLISH +PUBLISH=${PUBLISH:-} stable_release_str=stable-$release_name echo "Start Version Updating in docs project" echo "RELEASE_NAME : $Next_release" diff --git a/jjb/docs/docs_version_bump_projects.sh b/jjb/docs/docs_version_bump_projects.sh index b92a648082..31cb15994b 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 Silicon, Phosphorus." + echo " release_name: The release_name e.g Sulfur, Phosphorus." echo " PUBLISH: Set to true to PUBLISH" echo "" } @@ -39,7 +39,7 @@ cd "$WORKSPACE"/autorelease || exit GERRIT_PROJECT="releng/autorelease" if [ "$GERRIT_PROJECT" == "releng/autorelease" ]; then # User input - RELEASE_NAME=$RELEASE_NAME + RELEASE_NAME=${RELEASE_NAME:-} # Captilize Version Name release_name="$(tr '[:lower:]' '[:upper:]' <<< "${RELEASE_NAME:0:1}")${RELEASE_NAME:1}" echo "Start Version Updating in odl-projects" diff --git a/jjb/integration/csit-jobs-silicon.lst b/jjb/integration/csit-jobs-silicon.lst deleted file mode 100644 index 64d9502164..0000000000 --- a/jjb/integration/csit-jobs-silicon.lst +++ /dev/null @@ -1,22 +0,0 @@ -bgpcep-csit-1node-bgp-ingest-all-silicon, -bgpcep-csit-1node-bgp-ingest-mixed-all-silicon, -bgpcep-csit-1node-throughpcep-all-silicon, -bgpcep-csit-1node-userfeatures-all-silicon, -daexim-csit-1node-basic-only-silicon, -daexim-csit-3node-clustering-basic-only-silicon, -distribution-csit-1node-userfeatures-all-silicon, -distribution-csit-managed-silicon, -jsonrpc-csit-1node-basic-only-silicon, -odltools-csit-1node-upstream-all-silicon, -openflowplugin-csit-1node-cbench-only-silicon, -openflowplugin-csit-1node-flow-services-all-silicon, -openflowplugin-csit-1node-perf-bulkomatic-only-silicon, -openflowplugin-csit-1node-perf-stats-collection-only-silicon, -openflowplugin-csit-1node-scale-link-only-silicon, -openflowplugin-csit-1node-scale-only-silicon, -openflowplugin-csit-1node-scale-switch-only-silicon, -openflowplugin-csit-3node-clustering-bulkomatic-only-silicon, -openflowplugin-csit-3node-clustering-only-silicon, -openflowplugin-csit-3node-clustering-perf-bulkomatic-only-silicon, -ovsdb-csit-1node-upstream-southbound-all-silicon, -ovsdb-csit-3node-upstream-clustering-only-silicon, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 07696753bf..5b0d208a08 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -33,9 +33,6 @@ - phosphorus: branch: "stable/phosphorus" mvn-version: mvn35 - - silicon: - branch: "stable/silicon" - mvn-version: mvn35 - project: name: distribution-managed @@ -91,19 +88,6 @@ openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, - - silicon: - branch: "stable/silicon" - mvn-version: mvn35 - dependencies: > - bgpcep-maven-merge-{stream}, - daexim-maven-merge-{stream}, - jsonrpc-maven-merge-{stream}, - lispflowmapping-maven-merge-{stream}, - netconf-maven-merge-{stream}, - neutron-maven-merge-{stream}, - openflowplugin-maven-merge-{stream}, - ovsdb-maven-merge-{stream}, - serviceutils-maven-merge-{stream}, - project: name: distribution-full @@ -141,11 +125,6 @@ mvn-version: mvn35 dependencies: > distribution-merge-managed-{stream}, - - silicon: - branch: "stable/silicon" - mvn-version: mvn35 - dependencies: > - distribution-merge-managed-{stream}, - project: name: distribution-release @@ -175,9 +154,6 @@ - phosphorus: branch: "stable/phosphorus" mvn-version: mvn35 - - silicon: - branch: "stable/silicon" - mvn-version: mvn35 - project: name: distribution-sonar diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 52e45fe6ef..1bebf9bef8 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -49,16 +49,6 @@ serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping integration/distribution - - silicon: - branch: "stable/silicon" - mvn-version: "mvn35" - java-version: "openjdk11" - csit-list: !include: csit-jobs-silicon.lst - build-order: > - odlparent infrautils yangtools mdsal controller serviceutils aaa netconf - daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping - bgpcep integration/distribution - - project: name: integration-distribution project: integration/test @@ -110,19 +100,6 @@ csit-list: !include: csit-jobs-phosphorus.lst csit-mri-list: "{csit-mri-list-phosphorus}" csit-weekly-list: "{csit-weekly-list-phosphorus}" - - silicon: - branch: "stable/silicon" - csit-blocklist: > - aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo - netconf netvirt 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 - 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-silicon.lst - csit-mri-list: "{csit-mri-list-silicon}" - csit-weekly-list: "{csit-weekly-list-silicon}" - project: name: integration-sanity @@ -144,10 +121,6 @@ branch: "stable/phosphorus" karaf-version: odl csit-sanity-list: "{csit-sanity-list-phosphorus}" - - silicon: - branch: "stable/silicon" - karaf-version: odl - csit-sanity-list: "{csit-sanity-list-silicon}" - job-template: name: "integration-merge-dashboard" diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 255f50984a..01ecb715a1 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 1f5bb68d6c..454d692edb 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -78,31 +78,6 @@ # Used by the release job staging-profile-id: 96fdf4408765d -- project: - name: jsonrpc-silicon - 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: silicon - java-version: "openjdk11" - branch: "stable/silicon" - 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 9278dc4552..4348b0ac56 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -22,9 +22,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index fc4d46fc7b..798a2a8502 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -22,9 +22,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 3bc53753fa..5cd7cab1f1 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index e8a948b6b5..4c3f2ecb58 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index eeb872db46..b8e31e2514 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -99,38 +99,6 @@ # Used by the release job staging-profile-id: 96fff2503b766 -- project: - name: lispflowmapping-silicon - 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: silicon - project: "lispflowmapping" - project-name: "lispflowmapping" - branch: "stable/silicon" - 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 7022d10a64..425bf57c14 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index 1d010e2562..fedca236f4 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 - - silicon: - branch: "stable/silicon" - 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/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index aa4f502dc1..5e8a359d2d 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -15,9 +15,6 @@ - master: branch: "master" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: netconf diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 2c2fd9bbcd..cb0edd4b43 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -15,9 +15,6 @@ - master: branch: "master" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: netconf diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 66dfd632c9..1953058ffa 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -17,9 +17,6 @@ - master: branch: "master" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: netconf diff --git a/jjb/netconf/netconf-distribution-mri-test.yaml b/jjb/netconf/netconf-distribution-mri-test.yaml index 016cf13c1a..184782d48b 100644 --- a/jjb/netconf/netconf-distribution-mri-test.yaml +++ b/jjb/netconf/netconf-distribution-mri-test.yaml @@ -10,9 +10,6 @@ - master: branch: "master" java-version: "openjdk11" - - silicon: - branch: "stable/silicon" - java-version: "openjdk11" os-branch: "queens" diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index fb554abcb2..15d861ced5 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -15,9 +15,6 @@ - master: branch: "master" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: netconf @@ -58,13 +55,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*" - - silicon: - branch: "stable/silicon" - 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 c4c9117c9d..52792d1cb8 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -21,9 +21,6 @@ - master: branch: "master" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" karaf-version: netconf diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 6da152ad41..3420347be9 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -16,9 +16,6 @@ - phosphorus: branch: "stable/phosphorus" mvn-version: "mvn35" - - silicon: - branch: "stable/silicon" - mvn-version: "mvn35" os-branch: "queens" diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 6f5e657ce3..1c4fdb1b1c 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -19,28 +19,6 @@ # Used by the release job staging-profile-id: a67e1b40d7419 -- project: - name: neutron-silicon - jobs: - - "{project-name}-distribution-check-{stream}" - - "{project-name}-maven-javadoc-jobs" - - odl-maven-jobs-jdk11 - - odl-maven-verify-jobs - - stream: silicon - project: "neutron" - project-name: "neutron" - build-timeout: 90 - branch: "stable/silicon" - 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 a00459017f..ea1ed1ca13 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 - - silicon: - branch: "stable/silicon" - jre: "openjdk11" - functionality: "netconf" - robot-options: > - -e ODLMICRO_IGN - -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT - -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT install: - manual: @@ -103,18 +95,6 @@ -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400 -v SCALE_TESTS:TRUE - - silicon: - branch: "stable/silicon" - jre: "openjdk11" - functionality: "netconf-devices-scale" - robot-options: > - -e ODLMICRO_IGN - -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT - -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT - -v USE_NETCONF_CONNECTOR:False - -v SCHEMA_MODEL:juniper - -v INIT_DEVICE_COUNT:400 - -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 - - silicon: - branch: "stable/silicon" - jre: "openjdk11" - functionality: "netconf-general-scale" - robot-options: > - -e ODLMICRO_IGN - -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT - -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT - -v USE_NETCONF_CONNECTOR:False - -v SCHEMA_MODEL:juniper - -v INIT_DEVICE_COUNT:400 - -v SCALE_TESTS:TRUE install: - manual: scope: "test" diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml index 4165298472..810c47bc38 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-silicon - jobs: - - odl-maven-jobs-jdk11 - - odl-maven-verify-jobs - - stream: silicon - project: odlmicro - project-name: "odlmicro" - branch: "stable/silicon" - 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/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml index e4bbab9983..ca2bb733e5 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-silicon - jobs: - - odl-maven-jobs-jdk11 - - odl-maven-verify-jobs - - stream: silicon - project: "odlsaf" - project-name: "odlsaf" - build-node: centos7-builder-4c-4g - build-timeout: 120 - branch: "stable/silicon" - 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 be4537a0f4..48090e8233 100644 --- a/jjb/odltools/odltools-csit.yaml +++ b/jjb/odltools/odltools-csit.yaml @@ -19,9 +19,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" functionality: - "upstream" diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 4e4c3f9620..59ef495846 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index dda4a02384..6b0223f669 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - 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 007d66ab86..b5c808d9f9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 55d1a853cf..4ffa70b14e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index e1d5b0bdf7..1f08793a9b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -26,10 +26,6 @@ branch: "stable/phosphorus" jre: "openjdk11" install: "all" - - silicon: - branch: "stable/silicon" - 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 f558837c6a..63578421c9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -25,9 +25,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index dfe8d352e4..54a7e24b53 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - 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 6a26aef323..3ee8471d94 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 048da88552..407e44aec4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -22,9 +22,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 4eac308409..2f44fe626b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 4ff61cf595..2f5d49cced 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 8f90fc716b..aead9a5c42 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index a5bc62aae3..09f93f246b 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -21,10 +21,6 @@ branch: "stable/phosphorus" java-version: "openjdk11" mvn-version: "mvn35" - - silicon: - branch: "stable/silicon" - java-version: "openjdk11" - mvn-version: "mvn35" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 450053d581..d606e8fa50 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -99,39 +99,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-silicon - 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: silicon - project: "openflowplugin" - project-name: "openflowplugin" - branch: "stable/silicon" - 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 80764c501a..2dc384c312 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index f0b2e71b65..14102449fd 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -23,9 +23,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 6c9c8213d4..d525cf45bb 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -14,9 +14,6 @@ - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" - - silicon: - branch: "stable/silicon" - 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 32e484f925..fa59baa411 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -20,10 +20,6 @@ branch: "stable/phosphorus" java-version: "openjdk11" mvn-version: "mvn35" - - silicon: - branch: "stable/silicon" - java-version: "openjdk11" - mvn-version: "mvn35" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 58709ec730..c5d4978cc9 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -79,33 +79,6 @@ # Used by the release job staging-profile-id: a68b188166958 -- project: - name: ovsdb-silicon - 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: silicon - project: "ovsdb" - project-name: "ovsdb" - branch: "stable/silicon" - 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 3d984b3d81..bc7f772737 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-silicon - jobs: - - "{project-name}-maven-javadoc-jobs" - - odl-maven-jobs-jdk11 - - odl-maven-verify-jobs - - stream: silicon - project: "p4plugin" - project-name: "p4plugin" - branch: "stable/silicon" - 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/packaging/helm.yaml b/jjb/packaging/helm.yaml index bd62aeee06..5726b36d68 100644 --- a/jjb/packaging/helm.yaml +++ b/jjb/packaging/helm.yaml @@ -304,12 +304,12 @@ helm3.7 package . stream: - - "master": - branch: "sulfur" + - chlorine: + branch: "master" + - sulfur: + branch: "stable/sulfur" - phosphorus: branch: stable/phosphorus - - silicon: - branch: stable/silicon helm_bin: - helm3.7 diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 64b9fce314..7c8a2b45af 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -19,8 +19,6 @@ stream: - phosphorus: branch: stable/phosphorus - - silicon: - branch: stable/silicon - project: name: packaging-release diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index a04f4782bc..1d1977e9bd 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -16,9 +16,6 @@ - phosphorus: branch: "stable/phosphorus" mvn-version: "mvn35" - - silicon: - branch: "stable/silicon" - mvn-version: "mvn35" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index aad9dfb547..764cb924b1 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -99,38 +99,6 @@ # Used by the release job staging-profile-id: 12cc4ba8bf01ba -- project: - name: serviceutils-silicon - 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/silicon" - stream: silicon - - 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 5d3102063f..75f6285d69 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - all: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index eec62f779f..8da195a540 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -83,33 +83,6 @@ # Used by the release job staging-profile-id: a6927323fa3d4 -- project: - name: transportpce-silicon - 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: silicon - branch: "stable/silicon" - 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 78549965e2..7b3e3140d6 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -21,9 +21,6 @@ - phosphorus: branch: "stable/phosphorus" jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" install: - only: diff --git a/scripts/cut-branch-jobs.py b/scripts/cut-branch-jobs.py index 88cf3cb978..553dd83bfe 100755 --- a/scripts/cut-branch-jobs.py +++ b/scripts/cut-branch-jobs.py @@ -47,7 +47,7 @@ def create_and_update_project_jobs( Only updates projects where the top project configuration has a name that is equivalent to the current release. For example project name - "aaa-silicon" would have a release that matches what was passed to + "aaa-sulfur" would have a release that matches what was passed to release_on_stable_branch. """ for directory in filter( @@ -101,7 +101,7 @@ def update_job_streams(release_on_stable_branch, release_on_current_branch, job_ are handled by other functions in this script. Only updates projects where the top stream in the list is equivalent to the - current release. For example stream "silicon" would have a release that + current release. For example stream "sulfur" would have a release that matches what was passed to release_on_stable_branch. """ for directory in filter( @@ -328,7 +328,7 @@ def update_integration_csit_list( parser = argparse.ArgumentParser( description="""Creates & updates jobs for ODL projects when branch cutting. - Example usage: python scripts/cut-branch.sh Silicon Phosphorus jjb/ + Example usage: python scripts/cut-branch.sh Phosphorus Sulfur jjb/ ** If calling from tox the JOD_DIR is auto-detected so only pass the current and next release stream name. ** @@ -346,7 +346,7 @@ parser.add_argument( metavar="RELEASE_ON_CURRENT_BRANCH", type=str, help="""The ODL release codename for the new {} - (eg. Silicon, Phosphorus).""".format( + (eg. Sulfur, Phosphorus).""".format( default_branch ), ) -- 2.36.6