11 files changed, 22 insertions, 133 deletions
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index a3a19eee4..d2df7b091 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -35,12 +35,10 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     java-version: openjdk11
     maven-version: "mvn36"
     mvn-settings: "sdc-settings"
diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index ee8a9130d..13017687e 100644
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -6,15 +6,6 @@
       - project-view
 
 - project:
-    name: sdc-onap-ui-angular-info
-    project-name: "sdc-onap-ui-angular"
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: "sdc/onap-ui-angular"
-    branch: "master"
-
-- project:
     name: sdc-onap-ui-angular
     project-name: "sdc-onap-ui-angular"
     jobs:
@@ -24,12 +15,10 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     mvn-settings: "sdc-onap-ui-angular-settings"
     files: "**"
     archive-artifacts: ""
@@ -44,7 +33,6 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
     project: "sdc/onap-ui-angular"
     project-name: "sdc-onap-ui-angular"
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index 02251cac1..1ad898ad8 100644
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -1,14 +1,5 @@
 ---
 - project:
-    name: sdc-onap-ui-common-info
-    project-name: "sdc-onap-ui-common"
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: "sdc/onap-ui-common"
-    branch: "master"
-
-- project:
     name: sdc-onap-ui-common
     project-name: "sdc-onap-ui-common"
     jobs:
@@ -18,12 +9,10 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     mvn-settings: "sdc-onap-ui-common-settings"
     files: "**"
     archive-artifacts: ""
@@ -38,7 +27,6 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
     project: "sdc/onap-ui-common"
     project-name: "sdc-onap-ui-common"
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 2da4cad01..2ef4f8a86 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -22,12 +22,10 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     mvn-settings: "sdc-sdc-be-common-settings"
     files: "**"
     archive-artifacts: ""
@@ -42,7 +40,6 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
     project: "sdc/sdc-be-common"
     project-name: "sdc-sdc-be-common"
@@ -63,12 +60,3 @@
       - "master":
           branch: "master"
     mvn-settings: "sdc-sdc-be-common-settings"
-
-- project:
-    name: sdc-sdc-be-common-info
-    project-name: sdc-sdc-be-common
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: sdc/sdc-be-common
-    branch: master
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index c67e5c335..000362837 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -24,15 +24,12 @@
       - "master":
           branch: "master"
           java-version: openjdk11
-      - "jakarta":
-          branch: "jakarta"
-          java-version: openjdk11
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
       - "london":
           branch: "london"
           java-version: openjdk11
+      - "montreal":
+          branch: "montreal"
+          java-version: openjdk11
     mvn-settings: "sdc-sdc-distribution-client-settings"
     files: "**"
     archive-artifacts: ""
@@ -67,7 +64,6 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
     project: "sdc/sdc-distribution-client"
     project-name: "sdc-sdc-distribution-client"
@@ -90,12 +86,3 @@
           branch: "master"
     mvn-settings: "sdc-sdc-distribution-client-settings"
     java-version: openjdk11
-
-- project:
-    name: sdc-sdc-distribution-client-info
-    project-name: sdc-sdc-distribution-client
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: sdc/sdc-distribution-client
-    branch: master
diff --git a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
index 5b19f9c5c..1eaf58fad 100644
--- a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml
@@ -8,10 +8,10 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "sdc-helm-validator":
           trigger_jobs:
diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml
index d55c0e24f..bdc5df411 100644
--- a/jjb/sdc/sdc-sdc-helm-validator.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator.yaml
@@ -6,14 +6,6 @@
       - project-view
 
 - project:
-    name: sdc-sdc-helm-validator-info
-    project: sdc/sdc-helm-validator
-    project-name: sdc-sdc-helm-validator
-    build-node: centos8-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- project:
     name: sdc-sdc-helm-validator
     project-name: "sdc-sdc-helm-validator"
     java-version: openjdk11
@@ -53,7 +45,6 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
     project: "sdc/sdc-helm-validator"
     project-name: "sdc-sdc-helm-validator"
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 1b76a6e01..8ae46f5ae 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -1,14 +1,5 @@
 ---
 - project:
-    name: sdc-sdc-pubsub-info
-    project-name: "sdc-sdc-pubsub"
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: "sdc/sdc-pubsub"
-    branch: "master"
-
-- project:
     name: sdc-sdc-pubsub
     project-name: "sdc-sdc-pubsub"
     jobs:
@@ -18,12 +9,10 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     mvn-settings: "sdc-sdc-pubsub-settings"
     files: "**"
     archive-artifacts: ""
@@ -38,7 +27,6 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
     project: "sdc/sdc-pubsub"
     project-name: "sdc-sdc-pubsub"
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 37a6f705a..9f6dd3eb9 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -24,12 +24,10 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     mvn-settings: "sdc-sdc-tosca-settings"
     files: "**"
     archive-artifacts: ""
@@ -45,7 +43,6 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
     project: "sdc/sdc-tosca"
     project-name: "sdc-sdc-tosca"
@@ -68,13 +65,3 @@
           branch: "master"
     mvn-settings: "sdc-sdc-tosca-settings"
     java-version: openjdk11
-
-- project:
-    name: sdc-sdc-tosca-info
-    project-name: sdc-sdc-tosca
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: sdc/sdc-tosca
-    branch: master
-    java-version: openjdk11
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 99be2cb35..3f0033a2e 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -32,12 +32,10 @@
     stream:
       - "master":
           branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     mvn-settings: "sdc-sdc-workflow-designer-settings"
     files: "**"
     archive-artifacts: ""
@@ -54,7 +52,6 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
     project: "sdc/sdc-workflow-designer"
     project-name: "sdc-sdc-workflow-designer"
@@ -78,13 +75,3 @@
           branch: "master"
     mvn-settings: "sdc-sdc-workflow-designer-settings"
     java-version: openjdk11
-
-- project:
-    name: sdc-sdc-workflow-designer-info
-    project-name: sdc-sdc-workflow-designer
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: sdc/sdc-workflow-designer
-    branch: master
-    java-version: openjdk11
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index a1aae3d23..d6e68434b 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -76,15 +76,12 @@
       - "master":
           branch: "master"
           java-version: openjdk11
-      - "jakarta":
-          branch: "jakarta"
-          java-version: openjdk11
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
       - "london":
           branch: "london"
           java-version: openjdk11
+      - "montreal":
+          branch: "montreal"
+          java-version: openjdk11
     mvn-settings: "sdc-settings"
     files: "**"
     archive-artifacts: ""
@@ -100,7 +97,6 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-docker-8c-16g
     project: "sdc"
     project-name: "sdc"
@@ -129,12 +125,3 @@
     mvn-version: "mvn36"
     mvn-settings: "sdc-settings"
     java-version: openjdk11
-
-- project:
-    name: sdc-info
-    project-name: sdc
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: sdc
-    branch: master