Merge "Add DCAEGEN2-SERVICES-SDK build job"

diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index b85973b..217e9f8 100644 (file)
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -19,6 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-champ-settings'
     files: '**'
     archive-artifacts: ''
@@ -32,7 +34,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/champ'
     project-name: 'aai-champ'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-champ-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -43,5 +45,5 @@
       - gerrit-maven-clm
     project: 'aai/champ'
     project-name: 'aai-champ'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-champ-settings'

diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 3ff6a39..bf7f87f 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 8fea30f..6bdf288 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -9,6 +9,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     subproject:
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index c5e9015..a1efde6 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -20,6 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index 6f83f0f..7c2bd06 100644 (file)
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -13,8 +13,8 @@
     stream:
       - 'jar-master':
           branch: 'master'
-      - 'jar-beijing':
-          branch: 'beijing'
+      - 'jar-casablanca':
+          branch: 'casablanca'
       - 'jar-release-2.5.5':
           branch: 'release-2.5.5'
     mvn-settings: 'music-settings'

diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index 1e48b35..81c8328 100644 (file)
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'music-prom-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 89d8576..9f827e2 100644 (file)
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -20,8 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
+      - 'casablanca':
+          branch: 'casablanca'
       - 'dev-cassandra-only':
           branch: 'dev-cassandra-only'
     mvn-settings: 'music-settings'

diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index debaaa8..165ce3d 100644 (file)
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'oparent-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index c5d7261..33923c0 100644 (file)
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     functionality:
       - 'sanity':
           trigger_jobs: '{project-name}-{stream}-sdc-merge-java'

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'

diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index f3bf7eb..07409c8 100644 (file)
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-jtosca-settings'
     files: '**'
     archive-artifacts: ''
@@ -30,7 +32,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/jtosca'
     project-name: 'sdc-jtosca'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-jtosca-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -42,5 +44,5 @@
       - gerrit-maven-clm
     project: sdc/jtosca
     project-name: 'sdc-jtosca'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-jtosca-settings'

diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index c03e353..41a0444 100644 (file)
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -11,6 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 044468b..c45bd4f 100644 (file)
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -16,6 +16,9 @@
     stream:
       - 'master':
           branch: 'master'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
@@ -30,7 +33,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/sdc-tosca'
     project-name: 'sdc-sdc-tosca'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-sdc-tosca-settings'
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -42,5 +45,5 @@
       - gerrit-maven-clm
     project: sdc/sdc-tosca
     project-name: 'sdc-sdc-tosca'
-    branch: 'master'
+    branch: 'casablanca'
     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 66b7839..7da28b8 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -18,6 +18,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
@@ -34,7 +36,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'sdc/sdc-workflow-designer'
     project-name: 'sdc-sdc-workflow-designer'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
     mvn-goals: 'clean install'
@@ -47,5 +49,5 @@
     project: sdc/sdc-workflow-designer
     project-name: 'sdc-sdc-workflow-designer'
     build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 46bde2d..b0e566b 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -43,6 +43,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
@@ -57,7 +59,7 @@
     build-node: ubuntu1604-builder-8c-8g
     project: 'sdc'
     project-name: 'sdc'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-settings'
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     mvn-goals: 'clean install'
@@ -73,5 +75,5 @@
     project: sdc
     project-name: 'sdc'
     build-node: ubuntu1604-docker-8c-8g
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'sdc-settings'

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 023b490..030d8c5 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -32,4 +32,6 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'testsuite-settings'