From 46d3b8b00964f34ff6a95b1d50887fa469f61411 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 10 Jun 2025 13:50:09 -0400 Subject: [PATCH] Refine CCSDK builds Add builds for paris branches and remove builds for old release branches. Issue-ID: CIMAN-451 Change-Id: Ie5ae0a9145fd2ae83375d954a5a9883058c8d142 Signed-off-by: Dan Timoney --- jjb/ccsdk/apps.yaml | 4 ++-- jjb/ccsdk/ccsdk-csit.yaml | 10 ++++------ jjb/ccsdk/ccsdk-oran.yaml | 6 ++---- jjb/ccsdk/cds.yaml | 4 ++-- jjb/ccsdk/distribution.yaml | 6 +++--- jjb/ccsdk/features.yaml | 6 +++--- jjb/ccsdk/odl-legacy.yaml | 2 -- jjb/ccsdk/parent.yaml | 4 ++-- jjb/ccsdk/sli.yaml | 4 ++-- 9 files changed, 20 insertions(+), 26 deletions(-) diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 83f20b686..787b8f8b1 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -34,8 +34,6 @@ branch: "oslo" - "newdelhi": branch: "newdelhi" - - "montreal": - branch: "montreal" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-apps-settings" @@ -77,6 +75,8 @@ project: "ccsdk/apps" stream: + - "paris": + branch: "paris" - "master": branch: "master" java-version: openjdk21 diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 8cc764cd4..3492924d1 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -15,12 +15,12 @@ stream: - "master": branch: "master" + - "paris": + branch: "paris" - "oslo": branch: "oslo" - "newdelhi": branch: "newdelhi" - - "montreal": - branch: "montreal" mvn-settings: "ccsdk-distribution-settings" mvn-version: "mvn38" robot-options: "" @@ -40,14 +40,12 @@ stream: - "master": branch: "master" + - "paris": + branch: "paris" - "oslo": branch: "oslo" - "newdelhi": branch: "newdelhi" - - "montreal": - branch: "montreal" - - "london": - branch: "london" java-version: openjdk17 mvn-settings: "ccsdk-oran-settings" mvn-version: "mvn38" diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 69b5e0919..42c0aa9ec 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -28,10 +28,6 @@ branch: "oslo" - "newdelhi": branch: "newdelhi" - - "montreal": - branch: "montreal" - - "london": - branch: "london" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-oran-settings" @@ -71,6 +67,8 @@ stream: - "master": branch: "master" + - "paris": + branch: "paris" java-version: openjdk21 mvn-version: "mvn39" mvn-settings: "ccsdk-oran-settings" diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 482868ec0..ab93ea3d9 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -27,8 +27,6 @@ branch: "oslo" - "newdelhi": branch: "newdelhi" - - "montreal": - branch: "montreal" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-cds-settings" @@ -71,6 +69,8 @@ stream: - "master": branch: "master" + - "paris": + branch: "paris" java-version: openjdk21 mvn-version: "mvn39" mvn-settings: "ccsdk-cds-settings" diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 241e54ef8..1ad20d1e0 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -31,9 +31,6 @@ - "newdelhi": branch: "newdelhi" java-version: openjdk17 - - "montreal": - branch: "montreal" - java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-distribution-settings" files: "**" @@ -75,6 +72,9 @@ - "master": branch: "master" java-version: openjdk21 + - "paris": + branch: "paris" + java-version: openjdk21 mvn-version: "mvn39" mvn-settings: "ccsdk-distribution-settings" files: "**" diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index cc1d8917f..7d1eefdba 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -24,9 +24,6 @@ - "newdelhi": branch: "newdelhi" mvn-opts: "-Xmx3072m" - - "montreal": - branch: "montreal" - mvn-opts: "-Xmx3072m" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-features-settings" @@ -64,6 +61,9 @@ - "master": branch: "master" mvn-opts: "-Xmx3072m" + - "paris": + branch: "paris" + mvn-opts: "-Xmx3072m" java-version: openjdk21 mvn-version: "mvn39" mvn-settings: "ccsdk-features-settings" diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml index 09695ffe1..b21e0701a 100644 --- a/jjb/ccsdk/odl-legacy.yaml +++ b/jjb/ccsdk/odl-legacy.yaml @@ -28,8 +28,6 @@ branch: "master" - "newdelhi": branch: "newdelhi" - - "montreal": - branch: "montreal" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-odl-legacy-settings" diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 3f85cf8b9..fdd585dce 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -24,8 +24,6 @@ branch: "oslo" - "newdelhi": branch: "newdelhi" - - "montreal": - branch: "montreal" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-parent-settings" @@ -59,6 +57,8 @@ nexus-snapshot-repo: "snapshots" project: "ccsdk/parent" stream: + - "paris": + branch: "paris" - "master": branch: "master" jobs: diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index d5dfef1ec..8cc65a912 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -22,8 +22,6 @@ branch: "oslo" - "newdelhi": branch: "newdelhi" - - "montreal": - branch: "montreal" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-sli-settings" @@ -60,6 +58,8 @@ stream: - "master": branch: "master" + - "paris": + branch: "paris" java-version: openjdk21 mvn-version: "mvn39" mvn-settings: "ccsdk-sli-settings" -- 2.16.6