Adjust branches for ccsdk and sdnc

Remove old, unneeded branches and add quebec branches for ccsdk and sdnc repos.

Issue-ID: CCSDK-4145
Change-Id: Ifd460e0b7df7b3a7479b6b2beea7d2dac4caf3d7
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 787b8f8..27fc571 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -6,50 +6,7 @@
       - project-view
 
 - project:
       - project-view
 
 - project:

-    name: ccsdk-apps-released-java17
-    project-name: "ccsdk-apps"
-    jobs:
-      - gerrit-maven-verify:
-          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:
-          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: "ccsdk/apps"
-    stream:
-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-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: ""
-    build-node: centos8-docker-8c-8g
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
-- project:
-    name: ccsdk-apps-current-java21
+    name: ccsdk-apps

     project-name: "ccsdk-apps"
     jobs:
       - gerrit-maven-verify:
     project-name: "ccsdk-apps"
     jobs:
       - gerrit-maven-verify:


@@ -77,6 +34,8 @@
     stream:
       - "paris":
           branch: "paris"
     stream:
       - "paris":
           branch: "paris"

+      - "quebec":
+          branch: "quebec"

       - "master":
           branch: "master"
     java-version: openjdk21
       - "master":
           branch: "master"
     java-version: openjdk21

diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 4dcd4f5..d2c7103 100644 (file)
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -15,12 +15,10 @@
     stream:
       - "master":
           branch: "master"
     stream:
       - "master":
           branch: "master"

+      - "quebec":
+          branch: "quebec"

       - "paris":
           branch: "paris"
       - "paris":
           branch: "paris"

-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"

     mvn-settings: "ccsdk-distribution-settings"
     mvn-version: "mvn38"
     robot-options: ""
     mvn-settings: "ccsdk-distribution-settings"
     mvn-version: "mvn38"
     robot-options: ""


@@ -40,10 +38,6 @@
     stream:
       - "paris":
           branch: "paris"
     stream:
       - "paris":
           branch: "paris"

-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"

     java-version: openjdk17
     mvn-settings: "ccsdk-oran-settings"
     mvn-version: "mvn38"
     java-version: openjdk17
     mvn-settings: "ccsdk-oran-settings"
     mvn-version: "mvn38"


@@ -62,6 +56,8 @@
     # project name in gerrit
     project: "ccsdk/oran"
     stream:
     # project name in gerrit
     project: "ccsdk/oran"
     stream:

+      - "quebec":
+          branch: "quebec"

       - "master":
           branch: "master"
     java-version: openjdk21
       - "master":
           branch: "master"
     java-version: openjdk21

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 4c92784..8982f45 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -6,11 +6,11 @@
       - gerrit-maven-verify:
           cron: ""
       - gerrit-maven-merge:
       - gerrit-maven-verify:
           cron: ""
       - gerrit-maven-merge:

-          mvn-params: "-Dmaven.test.skip=true"
+          mvn-params: "-Dmaven.test.skip=true -DallowIncompleteProjects=true"

       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sign-artifacts: true

-          mvn-params: "-Dmaven.test.skip=true"
+          mvn-params: "-Dmaven.test.skip=true -DallowIncompleteProjects=true"

           mvn-opts: "-Ddocker.skip=true"
           cron: ""
           sbom-generator: true
           mvn-opts: "-Ddocker.skip=true"
           cron: ""
           sbom-generator: true


@@ -18,7 +18,7 @@
           build-node: centos8-docker-8c-8g
           container-public-registry: "nexus3.onap.org:10001"
           container-staging-registry: "nexus3.onap.org:10003"
           build-node: centos8-docker-8c-8g
           container-public-registry: "nexus3.onap.org:10001"
           container-staging-registry: "nexus3.onap.org:10003"

-          mvn-params: "-Dmaven.test.skip=true -Pdocker"
+          mvn-params: "-Dmaven.test.skip=true -Pdocker -DallowIncompleteProjects=true"

           maven-versions-plugin: true
       - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
           maven-versions-plugin: true
       - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g


@@ -40,7 +40,7 @@
     nexus-snapshot-repo: "snapshots"
 
 - project:
     nexus-snapshot-repo: "snapshots"
 
 - project:

-    name: ccsdk-oran-current-java21
+    name: ccsdk-oran

     project-name: "ccsdk-oran"
     jobs:
       - gerrit-maven-verify:
     project-name: "ccsdk-oran"
     jobs:
       - gerrit-maven-verify:


@@ -69,6 +69,8 @@
     stream:
       - "master":
           branch: "master"
     stream:
       - "master":
           branch: "master"

+      - "quebec":
+          branch: "quebec"

       - "paris":
           branch: "paris"
     java-version: openjdk21
       - "paris":
           branch: "paris"
     java-version: openjdk21

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index ab93ea3..ebd8fdc 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -1,48 +1,6 @@
 ---
 - project:
 ---
 - project:

-    name: ccsdk-cds-released-java17
-    project-name: "ccsdk-cds"
-    jobs:
-      - gerrit-maven-verify:
-          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:
-          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: "ccsdk/cds"
-    stream:
-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-cds-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: ""
-    build-node: centos8-docker-8c-8g
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
-- project:
-    name: ccsdk-cds-current-java21
+    name: ccsdk-cds

     project-name: "ccsdk-cds"
     jobs:
       - gerrit-maven-verify:
     project-name: "ccsdk-cds"
     jobs:
       - gerrit-maven-verify:


@@ -69,6 +27,8 @@
     stream:
       - "master":
           branch: "master"
     stream:
       - "master":
           branch: "master"

+      - "quebec":
+          branch: "quebec"

       - "paris":
           branch: "paris"
     java-version: openjdk21
       - "paris":
           branch: "paris"
     java-version: openjdk21

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 1ad20d1..9823873 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -1,48 +1,6 @@
 ---
 - project:
 ---
 - project:

-    name: ccsdk-distribution-released-java17
-    project-name: "ccsdk-distribution"
-    jobs:
-      - gerrit-maven-verify:
-          cron: ""
-      - 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"
-          maven-versions-plugin: true
-          cron: ""
-          sbom-generator: true
-      - gerrit-maven-docker-stage:
-          build-node: centos8-docker-8c-8g
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker"
-          maven-versions-plugin: true
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "ccsdk/distribution"
-    stream:
-      - "oslo":
-          branch: "oslo"
-          java-version: openjdk17
-      - "newdelhi":
-          branch: "newdelhi"
-          java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-distribution-settings"
-    files: "**"
-    archive-artifacts: ""
-    docker-pom: "pom.xml"
-    mvn-profile: docker
-    build-node: centos8-docker-8c-8g
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
-- project:
-    name: ccsdk-distribution-current-java21
+    name: ccsdk-distribution

     project-name: "ccsdk-distribution"
     jobs:
       - gerrit-maven-verify:
     project-name: "ccsdk-distribution"
     jobs:
       - gerrit-maven-verify:


@@ -72,6 +30,9 @@
       - "master":
           branch: "master"
           java-version: openjdk21
       - "master":
           branch: "master"
           java-version: openjdk21

+      - "quebec":
+          branch: "quebec"
+          java-version: openjdk21

       - "paris":
           branch: "paris"
           java-version: openjdk21
       - "paris":
           branch: "paris"
           java-version: openjdk21

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 79f25a6..c86bcfa 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -1,45 +1,6 @@
 ---
 - project:
 ---
 - project:

-    name: ccsdk-features-released-java17
-    project-name: "ccsdk-features"
-    jobs:
-      - gerrit-maven-verify:
-          cron: ""
-      - 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
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "ccsdk/features"
-    stream:
-      - "oslo":
-          branch: "oslo"
-          mvn-opts: "-Xmx3072m"
-      - "newdelhi":
-          branch: "newdelhi"
-          mvn-opts: "-Xmx3072m"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-features-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: ""
-    build-node: centos8-builder-4c-4g
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
-- project:
-    name: ccsdk-features-current-java21
+    name: ccsdk-features

     project-name: "ccsdk-features"
     jobs:
       - gerrit-maven-verify:
     project-name: "ccsdk-features"
     jobs:
       - gerrit-maven-verify:


@@ -63,6 +24,9 @@
       - "master":
           branch: "master"
           mvn-opts: "-Xmx3072m"
       - "master":
           branch: "master"
           mvn-opts: "-Xmx3072m"

+      - "quebec":
+          branch: "quebec"
+          mvn-opts: "-Xmx3072m"

       - "paris":
           branch: "paris"
           mvn-opts: "-Xmx3072m"
       - "paris":
           branch: "paris"
           mvn-opts: "-Xmx3072m"

diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml
deleted file mode 100644 (file)
index b21e070..0000000
--- a/jjb/ccsdk/odl-legacy.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
----
-- project:
-    name: ccsdk-odl-legacy-project-view
-    project-name: ccsdk-odl-legacy
-    views:
-      - project-view
-
-- project:
-    name: ccsdk-odl-legacy
-    project-name: "ccsdk-odl-legacy"
-    jobs:
-      - gerrit-maven-verify:
-          cron: ""
-      - 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
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "ccsdk/odl-legacy"
-    stream:
-      - "master":
-          branch: "master"
-      - "newdelhi":
-          branch: "newdelhi"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-odl-legacy-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: ""
-    build-node: centos8-builder-4c-4g
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
-- project:
-    name: ccsdk-odl-legacy-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
-    sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: centos8-builder-4c-4g
-    project: "ccsdk/odl-legacy"
-    project-name: "ccsdk-odl-legacy"
-    branch: "master"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-odl-legacy-settings"
-    mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m"
-
-- project:
-    name: ccsdk-odl-legacy-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: "onap-"
-    project: "ccsdk/odl-legacy"
-    project-name: "ccsdk-odl-legacy"
-    stream:
-      - "master":
-          branch: "master"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-odl-legacy-settings"
-    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    build-node: centos8-builder-4c-4g

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index fdd585d..2460549 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -1,42 +1,6 @@
 ---
 - project:
 ---
 - project:

-    name: ccsdk-parent-released-java17
-    project-name: "ccsdk-parent"
-    jobs:
-      - gerrit-maven-verify:
-          cron: ""
-      - 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
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-    project: "ccsdk/parent"
-    stream:
-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-parent-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: ""
-
-- project:
-    name: ccsdk-parent-current-java21
+    name: ccsdk-parent

     project-name: "ccsdk-parent"
     jobs:
       - gerrit-maven-verify:
     project-name: "ccsdk-parent"
     jobs:
       - gerrit-maven-verify:


@@ -59,6 +23,8 @@
     stream:
       - "paris":
           branch: "paris"
     stream:
       - "paris":
           branch: "paris"

+      - "quebec":
+          branch: "quebec"

       - "master":
           branch: "master"
           jobs:
       - "master":
           branch: "master"
           jobs:

diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 97f5796..25f06af 100644 (file)
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -1,43 +1,6 @@
 ---
 - project:
 ---
 - project:

-    name: ccsdk-sli-released-java17
-    project-name: "ccsdk-sli"
-    jobs:
-      - gerrit-maven-verify:
-          cron: ""
-      - 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
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "ccsdk/sli"
-    stream:
-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-sli-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: ""
-    build-node: centos8-builder-4c-4g
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
-- project:
-    name: ccsdk-sli-current-java21
+    name: ccsdk-sli

     project-name: "ccsdk-sli-current"
     jobs:
       - gerrit-maven-verify:
     project-name: "ccsdk-sli-current"
     jobs:
       - gerrit-maven-verify:


@@ -60,6 +23,8 @@
     stream:
       - "master":
           branch: "master"
     stream:
       - "master":
           branch: "master"

+      - "quebec":
+          branch: "quebec"

       - "paris":
           branch: "paris"
     java-version: openjdk21
       - "paris":
           branch: "paris"
     java-version: openjdk21

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index e3a4b7d..6352c36 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -6,57 +6,7 @@
       - project-view
 
 - project:
       - project-view
 
 - project:

-    name: sdnc-apps-java17
-    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:
-          cron: "@daily"
-          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:
-          cron: "@daily"
-          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:
-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"
-    java-version: openjdk17
-    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-java21
+    name: sdnc-apps

     project-name: "sdnc-apps"
     jobs:
       - gerrit-maven-verify:
     project-name: "sdnc-apps"
     jobs:
       - gerrit-maven-verify:


@@ -87,6 +37,8 @@
     stream:
       - "paris":
           branch: "paris"
     stream:
       - "paris":
           branch: "paris"

+      - "quebec":
+          branch: "quebec"

       - "master":
           branch: "master"
     java-version: openjdk21
       - "master":
           branch: "master"
     java-version: openjdk21

diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 9edf042..62a5bb7 100644 (file)
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -15,12 +15,10 @@
     stream:
       - "master":
           branch: "master"
     stream:
       - "master":
           branch: "master"

+      - "quebec":
+          branch: "quebec"

       - "paris":
           branch: "paris"
       - "paris":
           branch: "paris"

-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"

     mvn-settings: "sdnc-oam-settings"
     mvn-version: "mvn38"
     robot-options: ""
     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 88c8036..84f1445 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -1,42 +1,6 @@
 ---
 - project:
 ---
 - project:

-    name: sdnc-northbound-released-java17
-    project-name: "sdnc-northbound"
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos8-docker-8c-8g
-          cron: ""
-          sbom-generator: true
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "sdnc/northbound"
-    stream:
-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "sdnc-northbound-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-northbound-current-java21
+    name: sdnc-northbound

     project-name: "sdnc-northbound"
     jobs:
       - gerrit-maven-verify:
     project-name: "sdnc-northbound"
     jobs:
       - gerrit-maven-verify:


@@ -58,6 +22,8 @@
     stream:
       - "paris":
           branch: "paris"
     stream:
       - "paris":
           branch: "paris"

+      - "quebec":
+          branch: "quebec"

       - "master":
           branch: "master"
     java-version: openjdk21
       - "master":
           branch: "master"
     java-version: openjdk21

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 044e0b4..54bc61c 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -1,45 +1,6 @@
 ---
 - project:
 ---
 - project:

-    name: sdnc-oam-released-java17
-    project-name: "sdnc-oam"
-    jobs:
-      - gerrit-maven-verify:
-          cron: ""
-      - 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: centos8-docker-8c-8g
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker"
-          maven-versions-plugin: true
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-    project: "sdnc/oam"
-    stream:
-      - "oslo":
-          branch: "oslo"
-      - "newdelhi":
-          branch: "newdelhi"
-    java-version: openjdk17
-    mvn-version: "mvn38"
-    mvn-settings: "sdnc-oam-settings"
-    files: "**"
-    archive-artifacts: ""
-    sign-artifacts: true
-    build-node: centos8-docker-8c-8g
-    shallow-clone: true
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-
-- project:
-    name: sdnc-oam-current-java21
+    name: sdnc-oam

     project-name: "sdnc-oam"
     jobs:
       - gerrit-maven-verify:
     project-name: "sdnc-oam"
     jobs:
       - gerrit-maven-verify:


@@ -66,6 +27,8 @@
     stream:
       - "paris":
           branch: "paris"
     stream:
       - "paris":
           branch: "paris"

+      - "quebec":
+          branch: "quebec"

       - "master":
           branch: "master"
     java-version: openjdk21
       - "master":
           branch: "master"
     java-version: openjdk21