From 440bc45d10009b58a41968ae13a4eb5a7d408a24 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sat, 1 Apr 2023 08:20:50 +0530 Subject: [PATCH] Feat: Branch cut stable/argon stream Add jobs for stable/argon release. Move master to the next release Potassium (K). Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4670 Change-Id: I447cb95d8dbb8650c5171faa4d387dbde35fb2ad Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 4 ++- .../bgpcep-csit-bgpclustering-longevity.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 4 ++- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 4 ++- jjb/controller/controller-csit-akka1.yaml | 4 ++- .../controller-csit-clustering.yaml | 4 ++- .../controller-csit-cs-chasing-leader.yaml | 4 ++- .../controller-csit-cs-partnheal.yaml | 4 ++- ...ontroller-csit-ddb-expl-lead-movement.yaml | 4 ++- .../controller-csit-dnb-noloss.yaml | 4 ++- .../controller-csit-drb-partnheal.yaml | 4 ++- .../controller-csit-drb-precedence.yaml | 4 ++- .../controller-csit-dsbenchmark-cluster.yaml | 4 ++- .../controller-csit-dsbenchmark.yaml | 4 ++- .../controller-csit-rest-cars-perf.yaml | 4 ++- .../controller-csit-rest-clust-cars-perf.yaml | 4 ++- jjb/daexim/daexim-csit-basic.yaml | 4 ++- jjb/daexim/daexim-csit-clustering-basic.yaml | 4 ++- jjb/daexim/daexim.yaml | 27 +++++++++++++- jjb/integration/csit-jobs-potassium.lst | 20 +++++++++++ .../distribution/distribution-jobs.yaml | 29 ++++++++++++--- jjb/integration/integration-test-jobs.yaml | 11 ++++-- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 4 ++- jjb/jsonrpc/jsonrpc.yaml | 27 +++++++++++++- .../lispflowmapping-csit-msmr.yaml | 4 ++- jjb/lispflowmapping/lispflowmapping.yaml | 35 ++++++++++++++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 4 ++- jjb/mdsal/mdsal-csit-netty-replication.yaml | 9 ++++- .../openflowplugin-csit-cbench.yaml | 4 ++- ...flowplugin-csit-clustering-bulkomatic.yaml | 4 ++- ...lugin-csit-clustering-perf-bulkomatic.yaml | 4 ++- .../openflowplugin-csit-clustering.yaml | 4 ++- .../openflowplugin-csit-flow-services.yaml | 5 ++- .../openflowplugin-csit-longevity.yaml | 4 ++- .../openflowplugin-csit-perf-bulkomatic.yaml | 5 ++- ...flowplugin-csit-perf-stats-collection.yaml | 4 ++- .../openflowplugin-csit-sanity.yaml | 4 ++- .../openflowplugin-csit-scale-link.yaml | 4 ++- .../openflowplugin-csit-scale-switch.yaml | 4 ++- .../openflowplugin-csit-scale.yaml | 4 ++- .../openflowplugin-patch-test.yaml | 4 ++- jjb/openflowplugin/openflowplugin.yaml | 35 ++++++++++++++++++- jjb/ovsdb/ovsdb-csit-clustering.yaml | 4 ++- jjb/ovsdb/ovsdb-csit-southbound.yaml | 4 ++- jjb/ovsdb/ovsdb-full-integration.yaml | 4 ++- jjb/ovsdb/ovsdb-patch-test.yaml | 4 ++- jjb/ovsdb/ovsdb.yaml | 29 ++++++++++++++- jjb/serviceutils/serviceutils-patch-test.yaml | 4 ++- jjb/serviceutils/serviceutils.yaml | 34 +++++++++++++++++- jjb/yangtools/yangtools-csit-system.yaml | 4 ++- 54 files changed, 376 insertions(+), 58 deletions(-) create mode 100644 jjb/integration/csit-jobs-potassium.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index b8c5cd056..d885bf3f3 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index dd1702ce5..7f9045130 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 27919b3b7..a91ad1951 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 48ceac268..dc3455dbb 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 7a7690dc4..db38f4116 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index a6d4c08e2..1c111dd4d 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 263f84ebf..c294ea191 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index c9cb261e5..929b887a8 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 0d0a1c5ee..2809bc9e0 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -12,8 +12,10 @@ functionality: "akka1" stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 0bef63d19..437437ac7 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -13,8 +13,10 @@ elasticsearch-attribute: "disabled" stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index aba4cd92d..4e09c67d6 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 81010983f..800607c8f 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 798162968..2643292e5 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index e944d5934..87ff53bbd 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 008a44f48..8f3a0a83e 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 0158bf7dd..7ba09c6ac 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -16,8 +16,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index eb84962d3..25d463dd2 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 1dd93ce6a..28ee57eb1 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 2e3aa124f..043329649 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index fb769e98d..b9bf12141 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 73a137185..1c1bbba72 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 9e2aac295..9e9b63696 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 1e307543d..3bd3d38c0 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,29 @@ --- +- project: + name: daexim-potassium + 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: potassium + 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-argon jobs: @@ -14,7 +39,7 @@ project: "daexim" project-name: "daexim" stream: argon - branch: "master" + branch: "stable/argon" java-version: "openjdk17" mvn-settings: "daexim-settings" build-node: centos8-builder-4c-4g diff --git a/jjb/integration/csit-jobs-potassium.lst b/jjb/integration/csit-jobs-potassium.lst new file mode 100644 index 000000000..2c97a411b --- /dev/null +++ b/jjb/integration/csit-jobs-potassium.lst @@ -0,0 +1,20 @@ +bgpcep-csit-1node-bgp-ingest-all-potassium, +bgpcep-csit-1node-bgp-ingest-mixed-all-potassium, +bgpcep-csit-1node-throughpcep-all-potassium, +bgpcep-csit-1node-userfeatures-all-potassium, +daexim-csit-1node-basic-only-potassium, +daexim-csit-3node-clustering-basic-only-potassium, +distribution-csit-managed-potassium, +jsonrpc-csit-1node-basic-only-potassium, +openflowplugin-csit-1node-cbench-only-potassium, +openflowplugin-csit-1node-flow-services-all-potassium, +openflowplugin-csit-1node-perf-bulkomatic-only-potassium, +openflowplugin-csit-1node-perf-stats-collection-only-potassium, +openflowplugin-csit-1node-scale-link-only-potassium, +openflowplugin-csit-1node-scale-only-potassium, +openflowplugin-csit-1node-scale-switch-only-potassium, +openflowplugin-csit-3node-clustering-bulkomatic-only-potassium, +openflowplugin-csit-3node-clustering-only-potassium, +openflowplugin-csit-3node-clustering-perf-bulkomatic-only-potassium, +ovsdb-csit-1node-upstream-southbound-all-potassium, +ovsdb-csit-3node-upstream-clustering-only-potassium, diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 1859fe688..2bfd82b20 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -26,8 +26,10 @@ nexus-iq-stage: release email-upstream: "[int/dist]" stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: @@ -60,7 +62,7 @@ dist-pom: "distribution/pom.xml" stream: - - argon: + - potassium: branch: "master" dependencies: > daexim-maven-merge-{stream}, @@ -69,6 +71,15 @@ openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, + - argon: + branch: "stable/argon" + 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}, - chlorine: branch: "stable/chlorine" dependencies: > @@ -112,10 +123,14 @@ karaf-version: odl dist-pom: "distribution/opendaylight/pom.xml" stream: - - argon: + - potassium: branch: "master" dependencies: > distribution-merge-managed-{stream}, + - argon: + branch: "stable/argon" + dependencies: > + distribution-merge-managed-{stream}, - chlorine: branch: "stable/chlorine" dependencies: > @@ -149,8 +164,10 @@ staging-profile-id: 2af042ed81d5e2 stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: @@ -206,8 +223,10 @@ jobs: - "{project-name}-gerrit-docker-jobs" stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 5c911eeee..7bfa2495b 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -22,9 +22,16 @@ # CSIT Lists in defaults.yaml stream: - - argon: + - potassium: branch: "master" - csit-list: !include: csit-jobs-chlorine.lst + csit-list: !include: csit-jobs-potassium.lst + build-order: > + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution + - argon: + branch: "stable/argon" + csit-list: !include: csit-jobs-argon.lst build-order: > odlparent infrautils yangtools mdsal controller aaa netconf bgpcep serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 3be300150..eee55caa4 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index bc480e680..ee4622949 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,29 @@ --- +- project: + name: jsonrpc-potassium + 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: potassium + 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-argon jobs: @@ -15,7 +40,7 @@ project-name: "jsonrpc" stream: argon java-version: "openjdk17" - branch: "master" + branch: "stable/argon" 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 1ae1b1d00..fd94fa5ae 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 928ba580a..ea68c3e0b 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,37 @@ --- +- project: + name: lispflowmapping-potassium + 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: potassium + 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-argon jobs: @@ -16,7 +49,7 @@ stream: argon project: "lispflowmapping" project-name: "lispflowmapping" - branch: "master" + branch: "stable/argon" 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 8bb9c3ec7..7fb4dae77 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -13,8 +13,10 @@ functionality: "bindingv1" stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml index ffd041a49..6809f5fe3 100644 --- a/jjb/mdsal/mdsal-csit-netty-replication.yaml +++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml @@ -13,13 +13,20 @@ # Project branches stream: - - argon: + - potassium: branch: "master" install-features: > features-controller, odl-mdsal-replicate-netty, odl-netconf-clustered-topology, odl-clustering-test-app + - argon: + branch: "stable/argon" + install-features: > + features-controller, + odl-mdsal-replicate-netty, + odl-netconf-clustered-topology, + odl-clustering-test-app - chlorine: branch: "stable/chlorine" install-features: > diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 2e94f42f1..0e9d71c50 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index eca792dcc..000d2a2c9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 4271ef1e9..10162625f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index e6bf86dbd..aeaebfcaa 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index fe3124a3b..557486688 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - argon: + - potassium: branch: "master" install: "all" + - argon: + branch: "stable/argon" + install: "all" - chlorine: branch: "stable/chlorine" install: "all" diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 1d06f6005..31a0e5b07 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -17,8 +17,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index c3ee4b8ef..9471b89f0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -15,9 +15,12 @@ # Project branches stream: - - argon: + - potassium: branch: "master" install: "all" + - argon: + branch: "stable/argon" + install: "all" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index d3e6dee93..75348513f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 362c3e1f2..0d5e4ca61 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 5e71e3bb7..eccf5c768 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index d175964bc..b0a93e300 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -13,8 +13,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 3459916ec..6142b108b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 12a821972..abcd17eb5 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 9a802a4d1..0d709d671 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,37 @@ --- +- project: + name: openflowplugin-potassium + 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: potassium + 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-argon jobs: @@ -17,7 +50,7 @@ stream: argon project: "openflowplugin" project-name: "openflowplugin" - branch: "master" + branch: "stable/argon" 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 ebc4c7ecc..9f24d58d9 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index e0e5ffb2c..67e5fc4bc 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -15,8 +15,10 @@ # Project branches stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 70162dd48..49788a665 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -7,8 +7,10 @@ java-version: "openjdk17" stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index bddbd9042..e5eeace23 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -10,8 +10,10 @@ mvn-version: "mvn38" stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index ecf8664d0..cbb4ac456 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,31 @@ --- +- project: + name: ovsdb-potassium + 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: potassium + 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-argon jobs: @@ -16,7 +43,7 @@ stream: argon project: "ovsdb" project-name: "ovsdb" - branch: "master" + branch: "stable/argon" 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 431bee124..f618f9437 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -9,8 +9,10 @@ mvn-version: "mvn38" stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index d29645de4..817b975e8 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -1,6 +1,6 @@ --- - project: - name: serviceutils-argon + name: serviceutils-potassium jobs: - "{project-name}-distribution-check-{stream}" - "{project-name}-maven-javadoc-jobs": @@ -14,6 +14,38 @@ - odl-maven-verify-jobs-jdk17 branch: "master" + stream: potassium + + 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-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: 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/argon" stream: argon project: "serviceutils" diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 40b89e991..3100e874e 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -13,8 +13,10 @@ # Project branches. stream: - - argon: + - potassium: branch: "master" + - argon: + branch: "stable/argon" - chlorine: branch: "stable/chlorine" - sulfur: -- 2.36.6