Merge "CI: Remove deprecated branches"

80 files changed, 0 insertions, 713 deletions

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index d57586f1c..86f795aaa 100644
--- 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 6c50df1e4..c4d15cfa1 100644
--- 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 5315e2d0a..18622c6d5 100644
--- 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 44024d2f5..df11636cc 100644
--- 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 deca66156..ba29a79ec 100644
--- 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 7bb550b23..19aa0bdf7 100644
--- 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 f17b62d81..a4f084465 100644
--- 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 91e220d56..bc8d219fe 100644
--- 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 d5b182927..7f86a1173 100644
--- 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 110486fb0..001573456 100644
--- 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 01493e40c..b10dafe34 100644
--- 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 4b5de2f8f..f728bcbc2 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -6,47 +6,6 @@
       - 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"
     jobs:
@@ -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 3c7d09af7..8c7ddb686 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -19,34 +19,12 @@
           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:
       - "{project-name}-review-verification-maven-{stream}":
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 4f949f456..97e80332e 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -1,43 +1,5 @@
 ---
 - 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"
     jobs:
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 37fdd144b..0c5431f26 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -1,45 +1,5 @@
 ---
 - 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"
     jobs:
@@ -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 478e61d99..2b724916b 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -1,44 +1,5 @@
 ---
 - 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"
     jobs:
@@ -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 3847cecdf..69a5320d8 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -1,41 +1,5 @@
 ---
 - 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"
     jobs:
@@ -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 338e1658b..cef17dca5 100644
--- 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 74d71c25d..6ca6c587a 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -1,39 +1,5 @@
 ---
 - 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"
     jobs:
@@ -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 f047f101d..845c5d299 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -1,40 +1,5 @@
 ---
 - 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"
     jobs:
@@ -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 e10494a0b..5bd08d648 100644
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -1,28 +1,5 @@
 ---
 - 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
     mvn-version: "mvn36"
diff --git a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
index 9c18c5255..dd41dc2a1 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
@@ -1,26 +1,5 @@
 ---
 - 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
     mvn-version: "mvn36"
diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 57af7f292..d03af4ea7 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -45,41 +45,6 @@
     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
     mvn-version: mvn36
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 401d5487b..17b449b69 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -21,40 +21,6 @@
     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
     mvn-version: "mvn36"
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 283f55b17..ca82843bf 100644
--- 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 e19356671..923661a52 100644
--- 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 3e4bcb434..df2ff3bb7 100644
--- 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 77b705ff7..8b77ecc8f 100644
--- 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 3f97d3ea0..623da6f11 100644
--- 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 22d038f86..dd5c754fa 100644
--- 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 08d5177da..e24d420e9 100644
--- 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 3a959ce49..40ca7495d 100644
--- 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 a3abbe8a9..f89231618 100644
--- 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 c44963b0b..c117cd48e 100644
--- 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 2bd610a4f..e78396995 100644
--- 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 65f6ffa6c..a80332fee 100644
--- 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 8d339d264..b46c4094e 100644
--- 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 4bb8bf3f7..a2b6f69bc 100644
--- 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 6a664a1d8..3dc75ebda 100644
--- 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 33bf6023d..8a508b41a 100644
--- 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 00ca31a28..ae6f9556f 100644
--- 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 d9d0f8649..fa82d2c18 100644
--- 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 f315401d4..908da6978 100644
--- 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 fb3b6dccf..c659afe7a 100644
--- 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 fd821b1bf..d247b3891 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,29 +1,5 @@
 ---
 - 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"
     jobs:
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 7c9d9d626..260f75cdc 100644
--- 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 4ff27477a..5740b8266 100644
--- 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 3f7637628..7c4caa339 100644
--- 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 450144f80..9613f1feb 100644
--- 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 2c79c95c2..7484c7369 100644
--- 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 955498497..a6bf6d41c 100644
--- 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 7bda27a26..25f9de340 100644
--- 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 65c318d49..d92e58247 100644
--- 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 07b41aff6..d354d3fa9 100644
--- 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 1536ab06e..818466693 100644
--- 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 b97a2df1a..74f0c0423 100644
--- 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 595c6d1d5..2d394ecd3 100644
--- 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 8e7ab47d5..1e127316e 100644
--- 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/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index d2df7b091..ab65040bc 100644
--- 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 13017687e..da6be3173 100644
--- 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 1ad898ad8..528304b51 100644
--- 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 2ef4f8a86..b6d65ee3d 100644
--- 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 000362837..aaab74f4d 100644
--- 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 1eaf58fad..e2eb2a04d 100644
--- 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 8ae46f5ae..99d337cfd 100644
--- 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 9f6dd3eb9..57212b256 100644
--- 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 3f0033a2e..59d168561 100644
--- 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 d6e68434b..aae89a724 100644
--- 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 03380e9a4..856ddc7b4 100644
--- 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 6aa2b53f5..571cbb756 100644
--- 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 0b8c14d3c..479fed277 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -1,39 +1,5 @@
 ---
 - 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"
     jobs:
@@ -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 cbf4864eb..7f8f48ee3 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -1,42 +1,5 @@
 ---
 - 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"
     jobs:
@@ -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 1f739a6b1..459fdc2c6 100644
--- 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 9a469538a..8897a82c5 100644
--- 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 1bda2bde6..ec5fbdc02 100644
--- 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 4eda33bf7..e8f41051a 100644
--- 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 56d978b1f..5f9dc3aa8 100644
--- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml
+++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
@@ -6,8 +6,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "usecase-ui-intent-analysis-settings"
diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml
index 5942089f3..6eb4b8ab1 100644
--- a/jjb/usecaseui/usecase-ui-nlp.yaml
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@ -6,8 +6,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "usecase-ui-nlp-settings"
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 2b025388d..6c3325a0e 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -6,8 +6,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "usecase-ui-server-settings"
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index fe53327ee..fdf503c68 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -12,8 +12,6 @@
     stream:
       - "master":
           branch: "master"
-      - "london":
-          branch: "london"
       - "montreal":
           branch: "montreal"
     mvn-settings: "usecase-ui-settings"