Merge "Usecaseui adds a newdelhi branch"

diff --git a/global-jjb b/global-jjb
index 7637ce3..e66f993 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 7637ce39517e4e9e4838c0f95ee53cab9f0e865c
+Subproject commit e66f9937118449d46cecd213389fef2591bf6821

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index d57586f..86f795a 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -22,10 +22,6 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
     mvn-settings: "aai-aai-common-settings"
     mvn-version: "mvn35"
     files: "**"
@@ -84,14 +80,6 @@
           branch: "master"
           distro: "alpine"
           mvn-params: "docker"
-      - "jakarta":
-          branch: "jakarta"
-          distro: "alpine"
-          mvn-params: "docker"
-      - "kohn":
-          branch: "kohn"
-          distro: "alpine"
-          mvn-params: "docker"
     docker-name: "onap/aai-common-{distro}"
     docker-build-args: "-f ./Dockerfile.{distro}"
     docker-root: "$WORKSPACE/Dockerfiles/aai-common/"

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 6c50df1..c4d15cf 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -27,10 +27,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/babel"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-babel-settings"

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 5315e2d..18622c6 100644 (file)
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -28,10 +28,6 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "aai-graphadmin-settings"
     mvn-version: "mvn35"
     files: "**"

diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 44024d2..df11636 100644 (file)
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -20,10 +20,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/logging-service"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-logging-service-settings"

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index deca661..ba29a79 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -26,10 +26,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/model-loader"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-model-loader-settings"

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 7bb550b..19aa0bd 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -32,10 +32,6 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "aai-resources-settings"
     mvn-version: "mvn35"
     files: "**"

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index f17b62d..a4f0844 100644 (file)
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -20,10 +20,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/rest-client"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-rest-client-settings"

diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 91e220d..bc8d219 100644 (file)
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -28,10 +28,6 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "aai-schema-service-settings"
     mvn-version: "mvn36"
     files: "**"

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index d5b1829..7f86a11 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -26,10 +26,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/sparky-be"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-sparky-be-settings"

diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 110486f..0015734 100644 (file)
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -14,10 +14,6 @@
           build-node: centos7-docker-2c-1g
     project: "aai/sparky-fe"
     stream:
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "master":
           branch: "master"
     mvn-settings: "aai-sparky-fe-settings"

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 01493e4..b10dafe 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -31,10 +31,6 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "aai-traversal-settings"
     mvn-version: "mvn35"
     files: "**"

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 4b5de2f..f728bcb 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -5,47 +5,6 @@
     views:
       - project-view
 
-- project:
-    name: ccsdk-apps-java11
-    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:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    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-released-java17
     project-name: "ccsdk-apps"
@@ -73,8 +32,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-apps-settings"

diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 3c7d09a..8c7ddb6 100644 (file)
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -19,33 +19,11 @@
           branch: "montreal"
       - "london":
           branch: "london"
-      - "kohn":
-          branch: "kohn"
     mvn-settings: "ccsdk-distribution-settings"
     mvn-version: "mvn38"
     robot-options: ""
     branch: "master"
 
-- project:
-    name: ccsdk-oran-csit-java11
-    jobs:
-      - "{project-name}-review-verification-maven-{stream}":
-          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
-      - "{project-name}-merge-verification-maven-{stream}":
-          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
-    project-name: "ccsdk-oran"
-    recipients: "bjorn.magnusson@est.tech martin.c.yan@est.tech"
-    # project name in gerrit
-    project: "ccsdk/oran"
-    stream:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    mvn-settings: "ccsdk-oran-settings"
-    mvn-version: "mvn38"
-    robot-options: ""
-    branch: "master"
-
 - project:
     name: ccsdk-oran-csit-java17
     jobs:

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 4f949f4..97e8033 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -1,42 +1,4 @@
 ---
-- project:
-    name: ccsdk-oran-java11
-    project-name: "ccsdk-oran"
-    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"
-          mvn-opts: "-Ddocker.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 -Pdocker"
-          maven-versions-plugin: true
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-    project: "ccsdk/oran"
-    stream:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    mvn-version: "mvn38"
-    mvn-settings: "ccsdk-oran-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-oran-released-java17
     project-name: "ccsdk-oran"

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 37fdd14..0c5431f 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -1,44 +1,4 @@
 ---
-- project:
-    name: ccsdk-cds-java11
-    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:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    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-released-java17
     project-name: "ccsdk-cds"
@@ -65,8 +25,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-cds-settings"

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 478e61d..2b72491 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -1,43 +1,4 @@
 ---
-- project:
-    name: ccsdk-distribution-java11
-    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:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    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-released-java17
     project-name: "ccsdk-distribution"
@@ -67,9 +28,6 @@
       - "montreal":
           branch: "montreal"
           java-version: openjdk17
-      - "london":
-          branch: "london"
-          java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-distribution-settings"
     files: "**"

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 3847cec..69a5320 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -1,40 +1,4 @@
 ---
-- project:
-    name: ccsdk-features-java11
-    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:
-      - "kohn":
-          branch: "kohn"
-          mvn-opts: "-Xmx3072m -XX:MaxPermSize=1024m"
-    java-version: openjdk11
-    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-released-java17
     project-name: "ccsdk-features"
@@ -57,9 +21,6 @@
       - "montreal":
           branch: "montreal"
           mvn-opts: "-Xmx3072m"
-      - "london":
-          branch: "london"
-          mvn-opts: "-Xmx3072m"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-features-settings"

diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml
index 338e165..cef17dc 100644 (file)
--- a/jjb/ccsdk/odl-legacy.yaml
+++ b/jjb/ccsdk/odl-legacy.yaml
@@ -28,8 +28,6 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
     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 74d71c2..6ca6c58 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -1,38 +1,4 @@
 ---
-- project:
-    name: ccsdk-parent-java11
-    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:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    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-released-java17
     project-name: "ccsdk-parent"
@@ -56,8 +22,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-parent-settings"

diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index f047f10..845c5d2 100644 (file)
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -1,39 +1,4 @@
 ---
-- project:
-    name: ccsdk-sli-java11
-    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:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    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-released-java17
     project-name: "ccsdk-sli"
@@ -55,8 +20,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-sli-settings"

diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index 118b94d..5bd08d6 100644 (file)
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -1,27 +1,4 @@
 ---
-- project:
-    name: cps-csit-java11
-    java-version: openjdk11
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    jobs:
-      - "{project-name}-review-verification-maven-{stream}":
-          mvn-goals: clean install
-          mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
-      - "{project-name}-merge-verification-maven-{stream}":
-          mvn-goals: clean install
-          mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
-    project-name: "cps"
-    build-node: ubuntu1804-docker-8c-8g
-    recipients: "toine.siebelink@est.tech"
-    # project name in gerrit
-    project: "cps"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "cps-settings"
-    robot-options: ""
-    branch: "master"
 - project:
     name: cps-csit-java17
     java-version: openjdk17
@@ -42,6 +19,8 @@
     stream:
       - "master":
           branch: "master"
+      - "newdelhi":
+          branch: "newdelhi"
       - "montreal":
           branch: "montreal"
     mvn-settings: "cps-settings"

diff --git a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
index c9238f6..dd41dc2 100644 (file)
--- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
@@ -1,25 +1,4 @@
 ---
-- project:
-    name: cps-ncmp-dmi-plugin-csit-java11
-    java-version: openjdk11
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    jobs:
-      - "{project-name}-review-verification-maven-{stream}":
-          mvn-goals: clean install
-          mvn-params: "-Dmaven.test.skip=true -Pdocker"
-      - "{project-name}-merge-verification-maven-{stream}":
-          mvn-goals: clean install
-          mvn-params: "-Dmaven.test.skip=true -Pdocker"
-    project-name: "cps-ncmp-dmi-plugin"
-    recipients: "toine.siebelink@est.tech"
-    # project name in gerrit
-    project: "cps/ncmp-dmi-plugin"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "cps-ncmp-dmi-plugin-settings"
-    robot-options: ""
 - project:
     name: cps-ncmp-dmi-plugin-csit-java17
     java-version: openjdk17
@@ -39,6 +18,8 @@
     stream:
       - "master":
           branch: "master"
+      - "newdelhi":
+          branch: "newdelhi"
       - "montreal":
           branch: "montreal"
     mvn-settings: "cps-ncmp-dmi-plugin-settings"

diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 2895b2a..d03af4e 100644 (file)
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -34,6 +34,8 @@
     stream:
       - "master":
           branch: master
+      - "newdelhi":
+          branch: "newdelhi"
       - "montreal":
           branch: "montreal"
           cron: ""
@@ -42,41 +44,6 @@
     archive-artifacts: ""
     build-node: centos8-docker-8c-8g
 
-- project:
-    name: cps-ncmp-dmi-plugin-java11
-    java-version: openjdk11
-    mvn-version: mvn36
-    maven-version: mvn36
-    project-name: cps-ncmp-dmi-plugin
-    project: cps/ncmp-dmi-plugin
-    mvn-snapshot-id: "ecomp-snapshots"
-    nexus-snapshot-repo: "snapshots"
-    jobs:
-      - gerrit-maven-docker-verify:
-          container-public-registry: nexus3.onap.org:10001
-      - gerrit-maven-merge
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          sbom-generator: true
-      - gerrit-maven-docker-stage:
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: -Pdocker
-          container-public-registry: nexus3.onap.org:10001
-          container-staging-registry: nexus3.onap.org:10003
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-    stream:
-      - "london":
-          branch: "london"
-          cron: ""
-    mvn-settings: cps-ncmp-dmi-plugin-settings
-    files: "**"
-    archive-artifacts: ""
-    build-node: centos8-docker-8c-8g
-
 - project:
     name: cps-ncmp-dmi-plugin-clm
     java-version: openjdk17

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 629d446..17b449b 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -20,40 +20,6 @@
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: centos8-docker-8c-8g
 
-- project:
-    name: cps-java11
-    java-version: openjdk11
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    project-name: "cps"
-    project: "cps"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-params: "-P cps-ncmp-docker"
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          sbom-generator: true
-      - gerrit-maven-docker-stage:
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P cps-ncmp-docker"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-    stream:
-      - "london":
-          branch: "london"
-          cron: ""
-    mvn-settings: "cps-settings"
-    files: "**"
-    archive-artifacts: ""
-    build-node: centos8-docker-8c-8g
-
 - project:
     name: cps-java17
     java-version: openjdk17
@@ -82,6 +48,8 @@
     stream:
       - "master":
           branch: "master"
+      - "newdelhi":
+          branch: "newdelhi"
       - "montreal":
           branch: "montreal"
     mvn-settings: "cps-settings"

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 283f55b..ca82843 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -25,8 +25,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     mvn-settings: "dcaegen2-analytics-tca-gen2-settings"
     mvn-version: "mvn35"

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index e193566..923661a 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     # apply to all jobs
     project: "dcaegen2/collectors/datafile"

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 3e4bcb4..df2ff3b 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,8 +6,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     # apply to all jobs
     java-version: openjdk11
     project: "dcaegen2/collectors/hv-ves"

diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 77b705f..8b77ecc 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -23,8 +23,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     mvn-snapshot-id: "ecomp-snapshots"
     nexus-snapshot-repo: "snapshots"
     mvn-settings: "dcaegen2-collectors-restconf-settings"

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 3f97d3e..623da6f 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -8,8 +8,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     build-node: ubuntu1804-docker-8c-8g
     mvn-settings: "dcaegen2-collectors-snmptrap-settings"
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 22d038f..dd5c754 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -26,8 +26,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     mvn-settings: "dcaegen2-collectors-ves-settings"
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 08d5177..e24d420 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -14,8 +14,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     mvn-settings: "dcaegen2-deployments-settings"
     mvn-snapshot-id: "ecomp-snapshots"
     nexus-snapshot-repo: "snapshots"

diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index 3a959ce..40ca749 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -24,8 +24,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
     mvn-snapshot-id: "ecomp-snapshots"
     nexus-snapshot-repo: "snapshots"

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index a3abbe8..f892316 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -10,8 +10,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     maven-version: "mvn35"
     mvn-settings: "dcaegen2-services-settings"
@@ -51,8 +49,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     gerrit_trigger_file_paths:
       - compare-type: ANT
@@ -86,8 +82,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     gerrit_trigger_file_paths:
       - compare-type: ANT
@@ -121,8 +115,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     mvn-settings: "dcaegen2-services-settings"
     maven-deploy-properties: |

diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index c44963b..c117cd4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -86,8 +86,6 @@
     stream:
       - master:
           branch: master
-      - london:
-          branch: london
     jobs:
       - "{project-name}-docker-python-jobs"
 
@@ -103,8 +101,6 @@
     stream:
       - master:
           branch: master
-      - london:
-          branch: london
     jobs:
       - "{project-name}-docker-python-jobs"
 

diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 2bd610a..e783969 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -12,8 +12,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     mvn-settings: "dcaegen2-services-heartbeat-settings"
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index 65f6ffa..a80332f 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -10,8 +10,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     mvn-settings: "dcaegen2-services-settings"
     files: "**"

diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index 8d339d2..b46c409 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -24,8 +24,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     mvn-settings: "dcaegen2-services-mapper-settings"
     mvn-snapshot-id: "ecomp-snapshots"
     nexus-snapshot-repo: "snapshots"

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 4bb8bf3..a2b6f69 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,8 +6,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     # apply to all jobs
     project: "dcaegen2/services/pm-mapper"

diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 6a664a1..3dc75eb 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -22,8 +22,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     mvn-settings: "dcaegen2-services-prh-settings"
     mvn-snapshot-id: "ecomp-snapshots"

diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 33bf602..8a508b4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -18,8 +18,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     mvn-settings: "dcaegen2-services-sdk-settings"
     mvn-snapshot-id: "ecomp-snapshots"

diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 00ca31a..ae6f955 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -10,8 +10,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     mvn-settings: "dcaegen2-services-settings"
     container-public-registry: "nexus3.onap.org:10001"

diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index d9d0f86..fa82d2c 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -22,8 +22,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     java-version: openjdk11
     mvn-settings: "dcaegen2-services-son-handler-settings"
     mvn-snapshot-id: "ecomp-snapshots"

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index f315401..908da69 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -14,8 +14,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     mvn-settings: "dcaegen2-utils-settings"
     mvn-snapshot-id: "ecomp-snapshots"
     nexus-snapshot-repo: "snapshots"

diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index fb3b6dc..c659afe 100644 (file)
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,10 +17,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
-      - "kohn":
-          branch: "kohn"
     mvn-snapshot-id: "ecomp-snapshots"
     nexus-snapshot-repo: "snapshots"
     mvn-settings: "dcaegen2-settings"

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index fd821b1..d247b38 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,28 +1,4 @@
 ---
-- project:
-    name: dmaap-datarouter-java-11
-    project-name: "dmaap-datarouter"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java"
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-goals: "clean package -P docker docker:build docker:push"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-          cron: ""
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-    project: "dmaap/datarouter"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "dmaap-datarouter-settings"
-    files: "**"
-    archive-artifacts: ""
-    java-version: openjdk11
-
 - project:
     name: dmaap-datarouter-java-17
     project-name: "dmaap-datarouter"

diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 7c9d9d6..260f75c 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -16,8 +16,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
     files: "**"
     archive-artifacts: ""

diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 4ff2747..5740b82 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -18,8 +18,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     mvn-settings: "dmaap-messagerouter-messageservice-settings"
     java-version: openjdk11
     files: "**"

diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index 3f76376..7c4caa3 100644 (file)
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -30,10 +30,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
-      - "kohn":
-          branch: "kohn"
 
 - project:
     name: integration-xtesting-release
@@ -112,12 +108,6 @@
       - "master":
           branch: "master"
           files: ""
-      - "london":
-          branch: "london"
-          files: ""
-      - "kohn":
-          branch: "kohn"
-          files: ""
     docker-root: "$WORKSPACE"
     mvn-settings: "integration-settings"
     build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index 450144f..9613f1f 100644 (file)
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -9,8 +9,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
     functionality:
       - "certservice":
           trigger_jobs:

diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
index 2c79c95..7484c73 100644 (file)
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -12,9 +12,6 @@
       - "master":
           branch: "master"
           java-version: openjdk11
-      - "london":
-          branch: "london"
-          java-version: openjdk11
     project: "oom/platform/cert-service"
     mvn-settings: "oom-platform-cert-service-settings"
     files: "**"

diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 9554984..a6bf6d4 100644 (file)
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -30,8 +30,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
 
 - project:
     name: offline-installer-pytest
@@ -49,5 +47,3 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 7bda27a..25f9de3 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -13,10 +13,6 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
-      - "london":
-          branch: "london"
 
     jobs:
       - "{project-name}-{stream}-image-verify":

diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml
index 65c318d..d92e582 100644 (file)
--- a/jjb/oom/oom-main-linter.yaml
+++ b/jjb/oom/oom-main-linter.yaml
@@ -33,5 +33,3 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"

diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index 07b41af..d354d3f 100644 (file)
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -23,8 +23,6 @@
     stream:
       - "master":
           branch: "master"
-      - "istanbul":
-          branch: "istanbul"
     mvn-settings: "oparent-settings"
     java-version: openjdk11
     files: "**"

diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index 1536ab0..8184666 100644 (file)
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -12,7 +12,5 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "optf-has-settings"
     robot-options: ""

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index b97a2df..74f0c04 100644 (file)
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -6,8 +6,6 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "optf-has-settings"
     subproject:
       - "conductor":

diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
index 595c6d1..2d394ec 100644 (file)
--- a/jjb/optf/optf-osdf-csit.yaml
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -12,7 +12,5 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "optf-osdf-settings"
     robot-options: ""

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 8e7ab47..1e12731 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -7,8 +7,6 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
     mvn-settings: "optf-osdf-settings"
     subproject:
       - "osdf":

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 62b6ed7..c512064 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -36,6 +36,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-apex-pdp-settings"
@@ -44,41 +46,6 @@
     archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
-- project:
-    name: policy-apex-pdp
-    project-name: "policy-apex-pdp"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-profile: "docker"
-          mvn-params: "-P docker"
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/apex-pdp"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-docker-8c-8g
-
 - project:
     name: policy-apex-pdp-sonar
     jobs:

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index a1a6c15..482bbf0 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -30,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-api-settings"
@@ -38,41 +40,6 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: policy-api-java11
-    project-name: "policy-api"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/api"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-api-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-api-sonar
     jobs:

diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index b4d885c..51a4d2c 100644 (file)
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -30,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-clamp-settings"
@@ -38,46 +40,10 @@
     archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
-- project:
-    name: policy-clamp-java11
-    project-name: "policy-clamp"
-    jobs:
-      - gerrit-maven-stage:
-          build-node: centos8-docker-8c-8g
-          sbom-generator: true
-          maven-versions-plugin: true
-          sign-artifacts: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-          mvn-params: "-Dmaven.test.skip=true -P docker"
-      - "{project-name}-{stream}-verify-java":
-          mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-16g
-      - "{project-name}-{stream}-merge-java":
-          build-node: ubuntu1804-docker-8c-16g
-          mvn-params: "-P docker"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/clamp"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-clamp-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-docker-8c-8g
-
 - project:
     name: policy-clamp-sonar
     jobs:
-      - gerrit-maven-sonar:
+      - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index e9edb02..d4cde4e 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -20,6 +20,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
@@ -28,31 +30,6 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: policy-common-java11
-    project-name: "policy-common"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java"
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/common"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-common-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-common-sonar
     jobs:

diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index 993a1fb..4b54b4d 100644 (file)
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -36,8 +36,6 @@
 
     triggers:
       - timed: "@daily"
-      - reverse:
-          jobs: "{obj:trigger_jobs}"
 
     builders:
       - lf-infra-pre-build
@@ -96,7 +94,7 @@
           server: "{server-name}"
           project: "{project}"
           branch: "{branch}"
-          files: "**/csit/**"
+          files: "**/**"
 
     builders:
       - lf-infra-pre-build

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 774cd1e..99df2a4 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -10,15 +10,12 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     functionality:
       - "distribution"
-    trigger_jobs:
-      - "policy-distribution-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-xacml-pdp-project-csit
@@ -31,15 +28,12 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     functionality:
       - "xacml-pdp"
-    trigger_jobs:
-      - "policy-xacml-pdp-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-drools-applications-project-csit
@@ -52,15 +46,12 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     functionality:
       - "drools-applications"
-    trigger_jobs:
-      - "policy-drools-applications-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-drools-pdp-project-csit
@@ -73,15 +64,12 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     functionality:
       - "drools-pdp"
-    trigger_jobs:
-      - "policy-drools-pdp-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-apex-pdp-project-csit
@@ -94,15 +82,12 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     functionality:
       - "apex-pdp"
-    trigger_jobs:
-      - "policy-apex-pdp-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-pap-project-csit
@@ -115,15 +100,12 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     functionality:
       - "pap"
-    trigger_jobs:
-      - "policy-pap-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-api-project-csit
@@ -136,15 +118,12 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     functionality:
       - "api"
-    trigger_jobs:
-      - "policy-api-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-clamp-project-csit
@@ -159,11 +138,10 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     functionality:
       - "clamp"
-    trigger_jobs:
-      - "policy-clamp-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-apex-pdp-postgres-project-csit
@@ -178,6 +156,3 @@
           branch: "master"
     functionality:
       - "apex-pdp-postgres"
-    trigger_jobs:
-      - "policy-apex-pdp-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 965d16f..f213926 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -30,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-distribution-settings"
@@ -38,41 +40,6 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: policy-distribution-java11
-    project-name: "policy-distribution"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/distribution"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-distribution-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-distribution-sonar
     jobs:

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 7e06a40..54b81f3 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,35 +1,4 @@
 ---
-- project:
-    name: policy-docker-base-common
-    project-name: "policy-docker"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-profile: "docker"
-          mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-    mvn-settings: "policy-docker-settings"
-    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
-    java-version: openjdk11
-
-    project: "policy/docker"
-    stream:
-      - "london":
-          branch: "london"
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-docker-base-common-java-17
     project-name: "policy-docker"
@@ -61,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     files: "**"
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 6e19128..7715beb 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -1,41 +1,4 @@
 ---
-- project:
-    name: policy-drools-applications
-    project-name: "policy-drools-applications"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-profile: "docker"
-          mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker  -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/drools-applications"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-drools-applications-settings"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-docker-8c-8g
-
 - project:
     name: policy-drools-applications-java-17
     project-name: "policy-drools-applications"
@@ -67,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 14a9921..fdded00 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -1,39 +1,4 @@
 ---
-- project:
-    name: policy-drools-pdp
-    project-name: "policy-drools-pdp"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-profile: "docker"
-          mvn-params: "-P docker"
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker  -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/drools-pdp"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-drools-pdp-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-docker-8c-8g
-
 - project:
     name: policy-drools-pdp-java-17
     project-name: "policy-drools-pdp"
@@ -65,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-drools-pdp-settings"

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 22675c1..bbf1bdd 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -1,39 +1,4 @@
 ---
-- project:
-    name: policy-gui
-    project-name: "policy-gui"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/gui"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-gui-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-gui-java-17
     project-name: "policy-gui"
@@ -65,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-gui-settings"

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index c84ce41..e795fb0 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -30,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-models-settings"
@@ -38,41 +40,6 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: policy-models-java11
-    project-name: "policy-models"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/models"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-models-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-models-sonar
     jobs:

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index a62ae1c..8e0c2cb 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -30,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-pap-settings"
@@ -38,41 +40,6 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: policy-pap-java11
-    project-name: "policy-pap"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/pap"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-pap-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-pap-sonar
     jobs:

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index d20db03..b8d86c9 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -20,6 +20,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-parent-settings"
@@ -28,31 +30,6 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
-- project:
-    name: policy-parent-java11
-    project-name: "policy-parent"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java"
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/parent"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-parent-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-parent-clm
     jobs:

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 4f25778..36c35b0 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -1,39 +1,4 @@
 ---
-- project:
-    name: policy-xacml-pdp
-    project-name: "policy-xacml-pdp"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java":
-          docker-pom: "pom.xml"
-          mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: "-P docker -Dmaven.test.skip=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
-    project: "policy/xacml-pdp"
-    stream:
-      - "london":
-          branch: "london"
-    mvn-settings: "policy-xacml-pdp-settings"
-    java-version: openjdk11
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
 - project:
     name: policy-xacml-pdp-java-17
     project-name: "policy-xacml-pdp"
@@ -65,6 +30,8 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-xacml-pdp-settings"

diff --git a/jjb/portal-ng/portal-ng-bff.yaml b/jjb/portal-ng/portal-ng-bff.yaml
index 2e62e73..e9624b3 100644 (file)
--- a/jjb/portal-ng/portal-ng-bff.yaml
+++ b/jjb/portal-ng/portal-ng-bff.yaml
@@ -31,6 +31,10 @@
       - "master":
           branch: "master"
     mvn-settings: "portal-ng-bff-settings"
+    publish-credential: portal-ng-bff
+    publish-directory: /w/workspace/portal-ng-bff-gradle-publish-jar-master/lib/build/libs
+    publish-file-extension: jar
+    publish-url: https://nexus.onap.org/content/repositories/releases/org/onap/portal-ng-bff/
     wrapper: true
 
 - project:

diff --git a/jjb/portal-ng/portal-ng-history.yaml b/jjb/portal-ng/portal-ng-history.yaml
index e35493f..9bab5a2 100644 (file)
--- a/jjb/portal-ng/portal-ng-history.yaml
+++ b/jjb/portal-ng/portal-ng-history.yaml
@@ -33,3 +33,18 @@
       - "master":
           branch: "master"
     mvn-settings: "portal-ng-history-settings"
+
+- project:
+    name: portal-ng-history-release
+    project-name: "portal-ng-history"
+    project: "portal-ng/history"
+    branch: "master"
+    build-node: centos7-docker-2c-1g
+    docker-name: "onap/portal-ng/history"
+    container-tag-method: latest
+    jobs:
+      - "{project-name}-gerrit-release-jobs"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "portal-ng-history-settings"

diff --git a/jjb/portal-ng/portal-ng-preferences.yaml b/jjb/portal-ng/portal-ng-preferences.yaml
index 2f55b23..ff2e292 100644 (file)
--- a/jjb/portal-ng/portal-ng-preferences.yaml
+++ b/jjb/portal-ng/portal-ng-preferences.yaml
@@ -33,3 +33,18 @@
       - "master":
           branch: "master"
     mvn-settings: "portal-ng-preferences-settings"
+
+- project:
+    name: portal-ng-preferences-release
+    project-name: "portal-ng-preferences"
+    project: "portal-ng/preferences"
+    branch: "master"
+    build-node: centos7-docker-2c-1g
+    docker-name: "onap/portal-ng/preferences"
+    container-tag-method: latest
+    jobs:
+      - "{project-name}-gerrit-release-jobs"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "portal-ng-preferences-settings"

diff --git a/jjb/portal-ng/portal-ng-ui.yaml b/jjb/portal-ng/portal-ng-ui.yaml
index 48ea329..d4e8ced 100644 (file)
--- a/jjb/portal-ng/portal-ng-ui.yaml
+++ b/jjb/portal-ng/portal-ng-ui.yaml
@@ -19,3 +19,18 @@
       - "master":
           branch: "master"
     mvn-settings: "portal-ng-ui-settings"
+
+- project:
+    name: portal-ng-ui-release
+    project-name: "portal-ng-ui"
+    project: "portal-ng/ui"
+    branch: "master"
+    build-node: centos7-docker-2c-1g
+    docker-name: "onap/portal-ng/ui"
+    container-tag-method: latest
+    jobs:
+      - "{project-name}-gerrit-release-jobs"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "portal-ng-ui-settings"

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index d2df7b0..ab65040 100644 (file)
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -35,8 +35,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     java-version: openjdk11

diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index 1301768..da6be31 100644 (file)
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -15,8 +15,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "sdc-onap-ui-angular-settings"

diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index 1ad898a..528304b 100644 (file)
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -9,8 +9,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "sdc-onap-ui-common-settings"

diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 2ef4f8a..b6d65ee 100644 (file)
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -22,8 +22,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "sdc-sdc-be-common-settings"

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 0003628..aaab74f 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -24,9 +24,6 @@
       - "master":
           branch: "master"
           java-version: openjdk11
-      - "london":
-          branch: "london"
-          java-version: openjdk11
       - "montreal":
           branch: "montreal"
           java-version: openjdk11

diff --git a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
index 1eaf58f..e2eb2a0 100644 (file)
--- a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     functionality:

diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 8ae46f5..99d337c 100644 (file)
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -9,8 +9,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "sdc-sdc-pubsub-settings"

diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 9f6dd3e..57212b2 100644 (file)
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -24,8 +24,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "sdc-sdc-tosca-settings"

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 3f0033a..59d1685 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -32,8 +32,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "sdc-sdc-workflow-designer-settings"

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index d6e6843..aae89a7 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -76,9 +76,6 @@
       - "master":
           branch: "master"
           java-version: openjdk11
-      - "london":
-          branch: "london"
-          java-version: openjdk11
       - "montreal":
           branch: "montreal"
           java-version: openjdk11

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 03380e9..856ddc7 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -35,10 +35,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
-      - "kohn":
-          branch: "kohn"
     java-version: openjdk11
     mvn-version: "mvn38"
     mvn-settings: "sdnc-apps-settings"

diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 6aa2b53..571cbb7 100644 (file)
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -17,10 +17,6 @@
           branch: "master"
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
-      - "kohn":
-          branch: "kohn"
     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 0b8c14d..479fed2 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -1,38 +1,4 @@
 ---
-- project:
-    name: sdnc-northbound-java11
-    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:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    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-released-java17
     project-name: "sdnc-northbound"
@@ -51,8 +17,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-northbound-settings"

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index cbf4864..7f8f48e 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -1,41 +1,4 @@
 ---
-- project:
-    name: sdnc-oam-java11
-    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:
-      - "kohn":
-          branch: "kohn"
-    java-version: openjdk11
-    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-released-java17
     project-name: "sdnc-oam"
@@ -62,8 +25,6 @@
     stream:
       - "montreal":
           branch: "montreal"
-      - "london":
-          branch: "london"
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-oam-settings"

diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index 1f739a6..459fdc2 100644 (file)
--- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@ -30,9 +30,6 @@
       - "master":
           branch: "master"
           java-version: openjdk11
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
     mvn-settings: "so-adapters-so-etsi-sol003-adapter-settings"
     files: "**"
     archive-artifacts: ""

diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml
index 9a46953..8897a82 100644 (file)
--- a/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@ -30,12 +30,6 @@
       - "master":
           branch: "master"
           java-version: openjdk11
-      - "jakarta":
-          branch: "jakarta"
-          java-version: openjdk11
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
     mvn-settings: "so-adapters-so-nssmf-adapter-settings"
     files: "**"
     archive-artifacts: ""

diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index 1bda2bd..ec5fbdc 100644 (file)
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -11,9 +11,6 @@
       - "master":
           branch: "master"
           java-version: openjdk11
-      - "Custom_Workflow":
-          branch: "Custom_Workflow"
-          java-version: openjdk11
     functionality:
       - "integration-etsi-testing":
           trigger_jobs:

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 4eda33b..e8f4105 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -31,15 +31,6 @@
       - "master":
           branch: "master"
           java-version: openjdk11
-      - "london":
-          branch: "london"
-          java-version: openjdk11
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
-      - "recursive-orch":
-          branch: "recursive-orch"
-          java-version: openjdk11
     mvn-settings: "so-settings"
     files: "**"
     archive-artifacts: ""

diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
index 56d978b..6849e8f 100644 (file)
--- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml
+++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
@@ -6,10 +6,8 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
-      - "montreal":
-          branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-settings: "usecase-ui-intent-analysis-settings"
     jobs:
       - "{project-name}-{stream}-verify-java"

diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml
index 5942089..15c3f67 100644 (file)
--- a/jjb/usecaseui/usecase-ui-nlp.yaml
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@ -6,10 +6,8 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
-      - "montreal":
-          branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-settings: "usecase-ui-nlp-settings"
     jobs:
       - "{project-name}-{stream}-verify-java"

diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 2b02538..8f77f2b 100644 (file)
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -6,10 +6,8 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
-      - "montreal":
-          branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-settings: "usecase-ui-server-settings"
     jobs:
       - "{project-name}-{stream}-verify-java"

diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index fe53327..3780f06 100644 (file)
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -12,10 +12,8 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
-      - "montreal":
-          branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
     mvn-settings: "usecase-ui-settings"
     jobs:
       - "{project-name}-{stream}-verify-java"