From 3205d4e0e1853084142ba2f335a11b195b5f85ea Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 10 Jun 2025 13:53:50 -0400
Subject: [PATCH] Refine SDNC builds

Add builds for paris branches and remove builds for old release
branches.

Issue-ID: CIMAN-451
Change-Id: Iecc958c502c054b3d20cef31a0fc45418bfe6b56
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 jjb/sdnc/sdnc-apps.yaml       | 48 ++-----------------------------------------
 jjb/sdnc/sdnc-csit.yaml       |  4 ++--
 jjb/sdnc/sdnc-northbound.yaml |  4 ++--
 jjb/sdnc/sdnc-oam.yaml        |  4 ++--
 4 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 78e1291a9..e3a4b7d96 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -5,52 +5,6 @@
     views:
       - project-view
 
-- project:
-    name: sdnc-apps-java11
-    project-name: "sdnc-apps"
-    jobs:
-      - gerrit-maven-verify:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-          mvn-params: "-Ddocker.skip.push=true -Pdocker"
-      - gerrit-maven-merge:
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-stage:
-          build-node: centos8-docker-8c-8g
-          sign-artifacts: true
-          mvn-params: "-Dmaven.test.skip=true"
-          cron: ""
-          sbom-generator: true
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-          mvn-params: "-Dmaven.test.skip=true -Pdocker"
-          maven-versions-plugin: true
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "sdnc/apps"
-    stream:
-      - "montreal":
-          branch: "montreal"
-    java-version: openjdk11
-    mvn-version: "mvn38"
-    mvn-settings: "sdnc-apps-settings"
-
-    # due to a strange macro / variable translation problem this needs to be
-    # passed as a string block to properly get the properties correctly defined
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: "**"
-    archive-artifacts: ""
-    maven-version: "mvn38"
-    build-node: ubuntu1804-builder-4c-4g
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
 - project:
     name: sdnc-apps-java17
     project-name: "sdnc-apps"
@@ -131,6 +85,8 @@
 
     project: "sdnc/apps"
     stream:
+      - "paris":
+          branch: "paris"
       - "master":
           branch: "master"
     java-version: openjdk21
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 2e36912c1..9edf0429f 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -15,12 +15,12 @@
     stream:
       - "master":
           branch: "master"
+      - "paris":
+          branch: "paris"
       - "oslo":
           branch: "oslo"
       - "newdelhi":
           branch: "newdelhi"
-      - "montreal":
-          branch: "montreal"
     mvn-settings: "sdnc-oam-settings"
     mvn-version: "mvn38"
     robot-options: ""
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 861e83372..5002ef8c0 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -19,8 +19,6 @@
           branch: "oslo"
       - "newdelhi":
           branch: "newdelhi"
-      - "montreal":
-          branch: "montreal"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-northbound-settings"
@@ -54,6 +52,8 @@
 
     project: "sdnc/northbound"
     stream:
+      - "paris":
+          branch: "paris"
       - "master":
           branch: "master"
     java-version: openjdk21
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 4d56167a9..044e0b40b 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -27,8 +27,6 @@
           branch: "oslo"
       - "newdelhi":
           branch: "newdelhi"
-      - "montreal":
-          branch: "montreal"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-oam-settings"
@@ -66,6 +64,8 @@
           build-node: centos7-docker-2c-1g
     project: "sdnc/oam"
     stream:
+      - "paris":
+          branch: "paris"
       - "master":
           branch: "master"
     java-version: openjdk21
-- 
2.16.6