Add montreal branch to SDC jobs

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4677
Change-Id: Ic4e8267d669d3c44d4319d51c31ce04752a704bf

10 files changed, 22 insertions, 42 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 523de1f5b..4d86802bc 100644
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -15,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: ""
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index 4c34540dd..6210c7bab 100644
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -9,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: ""
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 0626b95c6..49a2b60c6 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: ""
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index ea5d9adb6..df84e993d 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: ""
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-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 37fe262cb..b463254d2 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -9,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: ""
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 3dd90eca2..905da447b 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: ""
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 897bfe418..aaf24b6da 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: ""
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index eb7b75d22..665edff78 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: ""