From c66102093626187308b241f79772e4165f43fab6 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sun, 25 Sep 2022 10:30:22 +1000 Subject: [PATCH] Feat: Branch cut stable/chlorine stream Move master to the next release, 2023.03 Argon (Ar). As this is a break-even point between Java 11 and Java 17 CSIT, make sure we default to Java 17 and only override the default where necessary. Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4458 Change-Id: Ia1163aac15cee36624d8f851ccad8a723548e2f8 Signed-off-by: Anil Belur Signed-off-by: Robert Varga --- jjb/aaa/aaa-csit-authn.yaml | 6 ++-- jjb/autorelease/autorelease-branch-lock.yaml | 4 ++- jjb/autorelease/autorelease-projects.yaml | 5 ++- .../autorelease-version-management.yaml | 4 ++- jjb/autorelease/view-autorelease-argon.yaml | 32 +++++++++++++++++ jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 6 ++-- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 6 ++-- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 6 ++-- .../bgpcep-csit-bgpclustering-longevity.yaml | 6 ++-- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 6 ++-- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 6 ++-- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 6 ++-- jjb/controller/controller-csit-akka1.yaml | 6 ++-- .../controller-csit-clustering.yaml | 6 ++-- .../controller-csit-cs-chasing-leader.yaml | 6 ++-- .../controller-csit-cs-partnheal.yaml | 6 ++-- ...ontroller-csit-ddb-expl-lead-movement.yaml | 6 ++-- .../controller-csit-dnb-noloss.yaml | 6 ++-- .../controller-csit-drb-partnheal.yaml | 6 ++-- .../controller-csit-drb-precedence.yaml | 6 ++-- .../controller-csit-dsbenchmark-cluster.yaml | 6 ++-- .../controller-csit-dsbenchmark.yaml | 6 ++-- .../controller-csit-rest-cars-perf.yaml | 6 ++-- .../controller-csit-rest-clust-cars-perf.yaml | 6 ++-- jjb/daexim/daexim-csit-basic.yaml | 6 ++-- jjb/daexim/daexim-csit-clustering-basic.yaml | 6 ++-- jjb/daexim/daexim.yaml | 27 +++++++++++++- jjb/defaults.yaml | 31 ++++++++++++++++ jjb/docs/docs-rtd.yaml | 4 ++- jjb/integration/csit-jobs-argon.lst | 20 +++++++++++ .../distribution/distribution-jobs.yaml | 30 +++++++++++++--- jjb/integration/integration-test-jobs.yaml | 32 ++++++++++++++--- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 6 ++-- jjb/jsonrpc/jsonrpc.yaml | 27 +++++++++++++- .../lispflowmapping-csit-msmr.yaml | 6 ++-- jjb/lispflowmapping/lispflowmapping.yaml | 35 ++++++++++++++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 6 ++-- jjb/mdsal/mdsal-csit-netty-replication.yaml | 11 ++++-- .../openflowplugin-csit-cbench.yaml | 6 ++-- ...flowplugin-csit-clustering-bulkomatic.yaml | 6 ++-- ...lugin-csit-clustering-perf-bulkomatic.yaml | 6 ++-- .../openflowplugin-csit-clustering.yaml | 6 ++-- .../openflowplugin-csit-flow-services.yaml | 7 ++-- .../openflowplugin-csit-longevity.yaml | 6 ++-- .../openflowplugin-csit-perf-bulkomatic.yaml | 7 ++-- ...flowplugin-csit-perf-stats-collection.yaml | 6 ++-- .../openflowplugin-csit-sanity.yaml | 6 ++-- .../openflowplugin-csit-scale-link.yaml | 6 ++-- .../openflowplugin-csit-scale-switch.yaml | 6 ++-- .../openflowplugin-csit-scale.yaml | 6 ++-- .../openflowplugin-patch-test.yaml | 9 ++--- jjb/openflowplugin/openflowplugin.yaml | 35 ++++++++++++++++++- jjb/ovsdb/ovsdb-csit-clustering.yaml | 6 ++-- jjb/ovsdb/ovsdb-csit-southbound.yaml | 6 ++-- jjb/ovsdb/ovsdb-full-integration.yaml | 7 ++-- jjb/ovsdb/ovsdb-patch-test.yaml | 9 ++--- jjb/ovsdb/ovsdb.yaml | 29 ++++++++++++++- jjb/serviceutils/serviceutils-patch-test.yaml | 9 ++--- jjb/serviceutils/serviceutils.yaml | 34 +++++++++++++++++- jjb/yangtools/yangtools-csit-system.yaml | 6 ++-- 60 files changed, 520 insertions(+), 116 deletions(-) create mode 100644 jjb/autorelease/view-autorelease-argon.yaml create mode 100644 jjb/integration/csit-jobs-argon.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 70c29cbb2..04e9ba427 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -7,15 +7,17 @@ # The project name project: "aaa" + jre: "openjdk17" # The functionality under test functionality: "authn" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/autorelease/autorelease-branch-lock.yaml b/jjb/autorelease/autorelease-branch-lock.yaml index 1daa333d1..542148e5b 100644 --- a/jjb/autorelease/autorelease-branch-lock.yaml +++ b/jjb/autorelease/autorelease-branch-lock.yaml @@ -88,8 +88,10 @@ jobs: - "{project-name}-gerrit-branch-lock-{stream}" stream: - - chlorine: + - argon: branch: "master" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" - phosphorus: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index ce07be47c..7a5e69fcb 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -50,8 +50,11 @@ - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}" stream: - - chlorine: + - argon: branch: "master" + integration-test: argon + - chlorine: + branch: "stable/chlorine" integration-test: chlorine project: releng/autorelease diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 2a5dbdcd8..b5386641a 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -11,8 +11,10 @@ build-node: centos7-builder-2c-8g stream: - - chlorine: + - argon: branch: "master" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" - phosphorus: diff --git a/jjb/autorelease/view-autorelease-argon.yaml b/jjb/autorelease/view-autorelease-argon.yaml new file mode 100644 index 000000000..440491c71 --- /dev/null +++ b/jjb/autorelease/view-autorelease-argon.yaml @@ -0,0 +1,32 @@ +--- +# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job +- releng_view: &releng_autorelease_view_common_argon + name: releng-view-autorelease-argon + 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-Argon + description: "List of Argon Merge jobs for Autorelease" + job-name: + - "daexim-maven-merge-argon" + - "integration/distribution-maven-merge-argon" + - "jsonrpc-maven-merge-argon" + - "lispflowmapping-maven-merge-argon" + - "openflowplugin-maven-merge-argon" + - "ovsdb-maven-merge-argon" + - "serviceutils-maven-merge-argon" + <<: *releng_autorelease_view_common_argon diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index af00f82e9..c01bb8039 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -6,6 +6,7 @@ # The project name project: "bgpcep" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 4a23d5bab..f4de205fc 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -7,15 +7,17 @@ # The project name project: "bgpcep" + jre: "openjdk17" # The functionality under test functionality: "bgp-ingest" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index eff8231c1..54ae9d0b0 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -6,15 +6,17 @@ # The project name project: "bgpcep" + jre: "openjdk17" # The functionality under test functionality: "bgpclustering-ha" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 719979c78..99f2e9ff8 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -6,6 +6,7 @@ # The project name project: "bgpcep" + jre: "openjdk17" # The functionality under test functionality: "bgpclustering-longevity" @@ -15,9 +16,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 16512d81a..b07fe93a6 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -6,15 +6,17 @@ # The project name project: "bgpcep" + jre: "openjdk17" # The functionality under test functionality: "bgpclustering" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 26568d90f..60e34f634 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -6,6 +6,7 @@ # The project name project: "bgpcep" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 4e29bc2ac..9d7ba8d5f 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -6,6 +6,7 @@ # The project name project: "bgpcep" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 1a20ad613..7428dbd94 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -6,14 +6,16 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "akka1" stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 9c33d26eb..437ec6f53 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -5,6 +5,7 @@ - inttest-csit-3node project: "controller" + jre: "openjdk17" functionality: - "clustering-ask" - "clustering-tell" @@ -12,9 +13,10 @@ elasticsearch-attribute: "disabled" stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 4e910f28f..7ca84904f 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -6,6 +6,7 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "cs-chasing-leader-longevity" @@ -15,9 +16,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 4ea409b4d..583e9d80e 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -6,6 +6,7 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "cs-partnheal-longevity" @@ -15,9 +16,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 07b8c9344..692ac7140 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -6,6 +6,7 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "ddb-expl-lead-movement-longevity" @@ -15,9 +16,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 77a182aed..3add89a18 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -6,6 +6,7 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "notifications-longevity" @@ -15,9 +16,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 32398fbef..01c8cdbee 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -6,6 +6,7 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "drb-partnheal-longevity" @@ -15,9 +16,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 4d3c62508..92c6760b1 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -6,6 +6,7 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "drb-precedence-longevity" @@ -15,9 +16,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 308997813..930a5740c 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -6,15 +6,17 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "benchmark" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 2d8993823..f05801344 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -6,15 +6,17 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "benchmark" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 424cbb746..2857f7997 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -6,15 +6,17 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: "rest-cars-perf" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 85bb05b76..c7d3436e3 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -6,6 +6,7 @@ # The project name project: "controller" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 29fa4daa7..6edc22a3a 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -6,15 +6,17 @@ # The project name project: "daexim" + jre: "openjdk17" # The functionality under test functionality: "basic" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 124f32057..fdd81bb1a 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -6,15 +6,17 @@ # The project name project: "daexim" + jre: "openjdk17" # The functionality under test functionality: "clustering-basic" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 3bcb29b00..9319983ad 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,29 @@ --- +- project: + name: daexim-argon + 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-jdk17 + - odl-maven-verify-jobs-jdk17 + + project: "daexim" + project-name: "daexim" + stream: argon + branch: "master" + java-version: "openjdk17" + mvn-settings: "daexim-settings" + build-node: centos8-builder-4c-4g + 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-chlorine jobs: @@ -14,7 +39,7 @@ project: "daexim" project-name: "daexim" stream: chlorine - branch: "master" + branch: "stable/chlorine" java-version: "openjdk17" mvn-settings: "daexim-settings" build-node: centos8-builder-4c-4g diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 9f0090cb1..a434bac71 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -304,3 +304,34 @@ csit-sanity-list-chlorine: > openflowplugin-csit-1node-sanity-only-chlorine, distribution-sanity-chlorine + csit-mri-list-argon: > + aaa-csit-1node-authn-all-argon, + controller-csit-1node-akka1-all-argon, + controller-csit-1node-benchmark-all-argon, + controller-csit-1node-rest-cars-perf-all-argon, + controller-csit-3node-benchmark-all-argon, + controller-csit-3node-clustering-ask-all-argon, + controller-csit-3node-clustering-tell-all-argon, + controller-csit-3node-rest-clust-cars-perf-ask-only-argon, + controller-csit-3node-rest-clust-cars-perf-tell-only-argon, + mdsal-csit-3node-netty-replicate-only-argon, + 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-master + csit-weekly-list-argon: > + controller-csit-1node-notifications-longevity-only-argon, + controller-csit-3node-drb-partnheal-longevity-only-argon, + controller-csit-3node-drb-precedence-longevity-only-argon, + controller-csit-3node-ddb-expl-lead-movement-longevity-only-argon, + bgpcep-csit-3node-bgpclustering-longevity-only-argon, + distribution-deploy-argon, + distribution-offline-argon, + openflowplugin-csit-1node-longevity-only-argon + csit-sanity-list-argon: > + openflowplugin-csit-1node-sanity-only-argon, + distribution-sanity-argon diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 038603243..edffa352b 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -6,8 +6,10 @@ - gerrit-tox-verify stream: - - chlorine: + - argon: branch: "master" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" - phosphorus: diff --git a/jjb/integration/csit-jobs-argon.lst b/jjb/integration/csit-jobs-argon.lst new file mode 100644 index 000000000..ad9493113 --- /dev/null +++ b/jjb/integration/csit-jobs-argon.lst @@ -0,0 +1,20 @@ +bgpcep-csit-1node-bgp-ingest-all-argon, +bgpcep-csit-1node-bgp-ingest-mixed-all-argon, +bgpcep-csit-1node-throughpcep-all-argon, +bgpcep-csit-1node-userfeatures-all-argon, +daexim-csit-1node-basic-only-argon, +daexim-csit-3node-clustering-basic-only-argon, +distribution-csit-managed-argon, +jsonrpc-csit-1node-basic-only-argon, +openflowplugin-csit-1node-cbench-only-argon, +openflowplugin-csit-1node-flow-services-all-argon, +openflowplugin-csit-1node-perf-bulkomatic-only-argon, +openflowplugin-csit-1node-perf-stats-collection-only-argon, +openflowplugin-csit-1node-scale-link-only-argon, +openflowplugin-csit-1node-scale-only-argon, +openflowplugin-csit-1node-scale-switch-only-argon, +openflowplugin-csit-3node-clustering-bulkomatic-only-argon, +openflowplugin-csit-3node-clustering-only-argon, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-argon, +ovsdb-csit-1node-upstream-southbound-all-argon, +ovsdb-csit-3node-upstream-clustering-only-argon, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 39af018ca..a6d755ed6 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -26,10 +26,13 @@ nexus-iq-stage: release email-upstream: "[int/dist]" stream: - - chlorine: + - argon: branch: "master" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" + java-version: openjdk11 - phosphorus: branch: "stable/phosphorus" mvn-version: mvn35 @@ -61,7 +64,7 @@ dist-pom: "distribution/pom.xml" stream: - - chlorine: + - argon: branch: "master" dependencies: > daexim-maven-merge-{stream}, @@ -70,6 +73,15 @@ openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, + - chlorine: + branch: "stable/chlorine" + dependencies: > + daexim-maven-merge-{stream}, + jsonrpc-maven-merge-{stream}, + lispflowmapping-maven-merge-{stream}, + openflowplugin-maven-merge-{stream}, + ovsdb-maven-merge-{stream}, + serviceutils-maven-merge-{stream}, - sulfur: branch: "stable/sulfur" java-version: "openjdk11" @@ -115,10 +127,14 @@ karaf-version: odl dist-pom: "distribution/opendaylight/pom.xml" stream: - - chlorine: + - argon: branch: "master" dependencies: > distribution-merge-managed-{stream}, + - chlorine: + branch: "stable/chlorine" + dependencies: > + distribution-merge-managed-{stream}, - sulfur: branch: "stable/sulfur" java-version: "openjdk11" @@ -152,8 +168,10 @@ staging-profile-id: 2af042ed81d5e2 stream: - - chlorine: + - argon: branch: "master" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" java-version: "openjdk11" @@ -211,8 +229,10 @@ jobs: - "{project-name}-gerrit-docker-jobs" stream: - - chlorine: + - argon: branch: "master" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" - phosphorus: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 16d28d194..c29cb0380 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -22,14 +22,20 @@ # CSIT Lists in defaults.yaml stream: - - chlorine: + - argon: branch: "master" csit-list: !include: csit-jobs-chlorine.lst build-order: > odlparent infrautils yangtools mdsal controller aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping integration/distribution - + - chlorine: + branch: "stable/chlorine" + csit-list: !include: csit-jobs-chlorine.lst + build-order: > + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution - sulfur: branch: "stable/sulfur" java-version: "openjdk11" @@ -38,7 +44,6 @@ odlparent infrautils yangtools mdsal controller aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping integration/distribution - - phosphorus: branch: "stable/phosphorus" mvn-version: "mvn35" @@ -61,8 +66,21 @@ # CSIT Lists in defaults.yaml stream: - - chlorine: + - argon: branch: "master" + csit-blocklist: > + aaa controller dluxapps genius lispflowmapping l2switch mdsal + netconf netvirt odlmicro sxp 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-argon.lst + csit-mri-list: "{csit-mri-list-argon}" + csit-weekly-list: "{csit-weekly-list-argon}" + - chlorine: + branch: "stable/chlorine" csit-blocklist: > aaa controller dluxapps genius lispflowmapping l2switch mdsal netconf netvirt odlmicro sxp yangtools @@ -109,9 +127,13 @@ - "integration-sanity-test-{stream}" stream: - - chlorine: + - argon: branch: "master" karaf-version: odl + csit-sanity-list: "{csit-sanity-list-argon}" + - chlorine: + branch: "stable/chlorine" + karaf-version: odl csit-sanity-list: "{csit-sanity-list-chlorine}" - sulfur: branch: "stable/sulfur" diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index baf34e8f9..58ef5fcf1 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -6,15 +6,17 @@ # The project name project: "jsonrpc" + jre: "openjdk17" # The functionality under test functionality: "basic" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 64129a209..eecfc0d9d 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,29 @@ --- +- project: + name: jsonrpc-argon + 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-jdk17 + - odl-maven-verify-jobs-jdk17 + + project: "jsonrpc" + project-name: "jsonrpc" + stream: argon + java-version: "openjdk17" + branch: "master" + mvn-settings: "jsonrpc-settings" + build-node: centos8-builder-4c-4g + 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-chlorine jobs: @@ -15,7 +40,7 @@ project-name: "jsonrpc" stream: chlorine java-version: "openjdk17" - branch: "master" + branch: "stable/chlorine" mvn-settings: "jsonrpc-settings" build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index dbd78d062..4afe5b45b 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -8,15 +8,17 @@ # The project name project: "lispflowmapping" + jre: "openjdk17" # The functionality under test functionality: "msmr" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 33385c4ba..bb6b0fbfb 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,37 @@ --- +- project: + name: lispflowmapping-argon + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + - "{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-jdk17 + - odl-maven-verify-jobs-jdk17 + + stream: argon + project: "lispflowmapping" + project-name: "lispflowmapping" + branch: "master" + java-version: "openjdk17" + 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: centos8-builder-8c-8g + + # Used by the release job + staging-profile-id: 96fff2503b766 + - project: name: lispflowmapping-chlorine jobs: @@ -16,7 +49,7 @@ stream: chlorine project: "lispflowmapping" project-name: "lispflowmapping" - branch: "master" + branch: "stable/chlorine" java-version: "openjdk17" mvn-settings: "lispflowmapping-settings" mvn-goals: "clean deploy -DrepoBuild" diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index fd78cf1ff..34d042837 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -6,15 +6,17 @@ # The project name project: "mdsal" + jre: "openjdk17" disable-job: true # The functionality under test functionality: "bindingv1" stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index 4d3dcc696..516ec6dfd 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -6,15 +6,22 @@ # The project name project: "mdsal" + jre: "openjdk17" # The functionality under test functionality: "netty-replicate" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + install-features: > + features-controller, + odl-mdsal-replicate-netty, + odl-netconf-clustered-topology, + odl-clustering-test-app + - chlorine: + branch: "stable/chlorine" install-features: > features-controller, odl-mdsal-replicate-netty, diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 630054ab7..c94994473 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -6,15 +6,17 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: "cbench" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 8da6c926f..68e9d842d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -6,6 +6,7 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index bc886366b..2572e5635 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -6,6 +6,7 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 0476867ac..ec2fa8697 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -6,6 +6,7 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 20f1a9ffd..286ceee88 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -6,6 +6,7 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,11 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + install: "all" + - chlorine: + branch: "stable/chlorine" install: "all" - sulfur: branch: "stable/sulfur" diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 292176a8d..27c28e2a7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -6,6 +6,7 @@ # The project name project: "openflowplugin" + jre: "openjdk17" build-timeout: 1440 # The functionality under test @@ -16,9 +17,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 2febba92e..190819352 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -6,6 +6,7 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,11 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + install: "all" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 48cdc518b..c09a5938f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -6,6 +6,7 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 00beb144a..64a5f2e43 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -7,15 +7,17 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: "sanity" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 1ef979e78..a24bae30e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -6,15 +6,17 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: "scale-link" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 24a99953c..ba26e0162 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -6,15 +6,17 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: "scale-switch" # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 7ae371f29..5bffe82a7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -6,6 +6,7 @@ # The project name project: "openflowplugin" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index ffbb5b61f..fb0ac281d 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -6,17 +6,18 @@ # The project name project: "openflowplugin" + java-version: "openjdk17" + mvn-version: "mvn38" # Project branches stream: - - chlorine: + - argon: branch: "master" - java-version: "openjdk17" - mvn-version: "mvn38" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" java-version: "openjdk11" - mvn-version: "mvn38" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 25825d077..5f2f1e29b 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,37 @@ --- +- project: + name: openflowplugin-argon + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + - "{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-jdk17 + - odl-maven-verify-jobs-jdk17 + + stream: argon + project: "openflowplugin" + project-name: "openflowplugin" + branch: "master" + build-node: centos8-builder-4c-4g + build-timeout: 90 + java-version: "openjdk17" + mvn-settings: "openflowplugin-settings" + mvn-goals: "clean deploy javadoc:aggregate" + 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-chlorine jobs: @@ -17,7 +50,7 @@ stream: chlorine project: "openflowplugin" project-name: "openflowplugin" - branch: "master" + branch: "stable/chlorine" build-node: centos8-builder-4c-4g build-timeout: 90 java-version: "openjdk17" diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 33eb0d07b..6bb490bac 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -6,6 +6,7 @@ # The project name project: "ovsdb" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 96f57ca5e..162ea31b3 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -6,6 +6,7 @@ # The project name project: "ovsdb" + jre: "openjdk17" # The functionality under test functionality: @@ -14,9 +15,10 @@ # Project branches stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index e61a2a1b2..bb1acbdb8 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -4,10 +4,13 @@ jobs: - "ovsdb-daily-full-integration-{stream}" + java-version: "openjdk17" + stream: - - chlorine: + - argon: branch: "master" - java-version: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" java-version: "openjdk11" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 17319de99..780a1cf50 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -6,16 +6,17 @@ # The project name project: "ovsdb" + java-version: "openjdk17" + mvn-version: "mvn38" stream: - - chlorine: + - argon: branch: "master" - java-version: "openjdk17" - mvn-version: "mvn38" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" java-version: "openjdk11" - mvn-version: "mvn38" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 6d7a12d38..57c13671d 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,31 @@ --- +- project: + name: ovsdb-argon + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + - "{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-jdk17 + - odl-maven-verify-jobs-jdk17 + + stream: argon + project: "ovsdb" + project-name: "ovsdb" + branch: "master" + build-node: centos8-builder-4c-4g + java-version: "openjdk17" + mvn-settings: "ovsdb-settings" + 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-chlorine jobs: @@ -16,7 +43,7 @@ stream: chlorine project: "ovsdb" project-name: "ovsdb" - branch: "master" + branch: "stable/chlorine" build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "ovsdb-settings" diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 063f63921..4e840d8cd 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -5,16 +5,17 @@ - inttest-patch-test project: "serviceutils" + java-version: "openjdk17" + mvn-version: "mvn38" stream: - - chlorine: + - argon: branch: "master" - java-version: "openjdk17" - mvn-version: "mvn38" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" java-version: "openjdk11" - mvn-version: "mvn38" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 7bba04192..f995f26e6 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -1,6 +1,6 @@ --- - project: - name: serviceutils-chlorine + name: serviceutils-argon jobs: - "{project-name}-distribution-check-{stream}" - "{project-name}-maven-javadoc-jobs": @@ -14,6 +14,38 @@ - odl-maven-verify-jobs-jdk17 branch: "master" + stream: argon + + project: "serviceutils" + project-name: "serviceutils" + build-node: centos8-builder-2c-2g + java-version: "openjdk17" + mvn-settings: "serviceutils-settings" + 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-chlorine + jobs: + - "{project-name}-distribution-check-{stream}" + - "{project-name}-maven-javadoc-jobs": + mvn-version: mvn38 + - "{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-jdk17 + - odl-maven-verify-jobs-jdk17 + + branch: "stable/chlorine" stream: chlorine project: "serviceutils" diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 6fd6f54ba..94f3906af 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -6,15 +6,17 @@ # The project name project: "yangtools" + jre: "openjdk17" # The functionality under test functionality: "system" # Project branches. stream: - - chlorine: + - argon: branch: "master" - jre: "openjdk17" + - chlorine: + branch: "stable/chlorine" - sulfur: branch: "stable/sulfur" jre: "openjdk11" -- 2.36.6