Update SDC DCAE-D JJB

Make updates to the DCAE-D JJB to support the Casablanca branch.

* Add new stream for the branch
* Updated CLM and sonar to run on the new branch

Change-Id: I81ca9d6da63f2293a87133ce438bb8d6ff507bc1
Issue-ID: SDC-1913
Signed-off-by: Michael Lando <michael.lando@intl.att.com>

diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index 5665900..15f0157 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -20,6 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-ci-settings'
     files: '**'
     archive-artifacts: ''
@@ -33,7 +35,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/ci'
     project-name: 'sdc-dcae-d-ci'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-ci-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -45,5 +47,5 @@
       - gerrit-maven-clm
     project: sdc/dcae-d/ci
     project-name: 'sdc-dcae-d-ci'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-ci-settings'

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index 5d0f4b6..d83fda2 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     files: '**'
     archive-artifacts: ''
@@ -27,7 +29,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-main'
     project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -39,5 +41,5 @@
       - gerrit-maven-clm
     project: sdc/dcae-d/dt-be-main
     project-name: 'sdc-dcae-d-dt-be-main'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
index 0e642df..734b983 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -10,6 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
     files: '**'
     archive-artifacts: ''
@@ -23,7 +25,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/dt-be-property'
     project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -35,5 +37,5 @@
       - gerrit-maven-clm
     project: sdc/dcae-d/dt-be-property
     project-name: 'sdc-dcae-d-dt-be-property'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'

diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index 5e5183d..58369a1 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     files: '**'
     archive-artifacts: ''
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/dt'
     project-name: 'sdc-dcae-d-dt'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -41,5 +43,5 @@
     project: sdc/dcae-d/dt
     project-name: 'sdc-dcae-d-dt'
     build-node: ubuntu1604-builder-4c-2g
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-dt-settings'

diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index c869906..d8e6ebb 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     files: '**'
     archive-artifacts: ''
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/dcae-d/fe'
     project-name: 'sdc-dcae-d-fe'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -41,5 +43,5 @@
     project: sdc/dcae-d/fe
     project-name: 'sdc-dcae-d-fe'
     build-node: ubuntu1604-builder-4c-2g
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-fe-settings'

diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
index fa4e651..3242c40 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     subproject:
     - dcae-d-tosca-lab:
         path: '.'
@@ -27,7 +29,7 @@
     build-node: ubuntu1604-docker-8c-8g
     project: 'sdc/dcae-d/tosca-lab'
     project-name: 'sdc-dcae-d-tosca-lab'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'