24 files changed, 148 insertions, 22 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 5330020b9..4dddda5a3 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -46,6 +46,8 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 4fc62cb31..fc886cf6b 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -47,7 +47,9 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/babel'
     project-name: 'aai-babel'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-babel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index 38e4c4be1..0e90a12b7 100644
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -44,7 +44,9 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/cacher'
     project-name: 'aai-cacher'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
 
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index c550684fc..a3befbb0a 100644
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -34,5 +34,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/chameleon'
     project-name: 'aai-chameleon'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-chameleon-settings'
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index ea1cb469e..c83335b78 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -47,5 +47,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/champ'
     project-name: 'aai-champ'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-champ-settings'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index e28922fe6..870f9bcbe 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -46,5 +46,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/data-router'
     project-name: 'aai-data-router'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-data-router-settings'
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index 11c1d9fee..c473cdab0 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -35,5 +35,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/esr-gui'
     project-name: 'aai-esr-gui'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-esr-gui-settings'
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 26ab6feed..0d8c99089 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -48,5 +48,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/esr-server'
     project-name: 'aai-esr-server'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-esr-server-settings'
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 0b6efb861..ad7da4cd8 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -42,5 +42,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/event-client'
     project-name: 'aai-event-client'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-event-client-settings'
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
index 2623d2374..fefd7c901 100644
--- a/jjb/aai/aai-gallifrey.yaml
+++ b/jjb/aai/aai-gallifrey.yaml
@@ -27,5 +27,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/gallifrey'
     project-name: 'aai-gallifrey'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-gallifrey-settings'
diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 6fa3d576e..bb460182c 100644
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -47,5 +47,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/gizmo'
     project-name: 'aai-gizmo'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-gizmo-settings'
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index f7307e809..7e608e190 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -50,6 +50,8 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
new file mode 100644
index 000000000..5464086af
--- /dev/null
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: aai-graphgraph
+    project-name: aai-graphgraph
+    views:
+      - project-view
+
+- project:
+    name: aai-graphgraph-master
+    project-name: 'aai-graphgraph'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    project: 'aai/graphgraph'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-graphgraph-settings'
+    files: '**'
+    archive-artifacts: ''
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index c9be3f531..566ae9089 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -42,5 +42,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/logging-service'
     project-name: 'aai-logging-service'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-logging-service-settings'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index bce3defa6..b9382be24 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -47,5 +47,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-model-loader-settings'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index a1d9cbc43..30338af63 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -50,6 +50,8 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/resources'
     project-name: 'aai-resources'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 342564367..025fc7fc2 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -42,5 +42,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/rest-client'
     project-name: 'aai-rest-client'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-rest-client-settings'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 19654c9f4..d7e2e22a3 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -42,5 +42,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/router-core'
     project-name: 'aai-router-core'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-router-core-settings'
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
new file mode 100644
index 000000000..e4c4bd1a9
--- /dev/null
+++ b/jjb/aai/aai-schema-service.yaml
@@ -0,0 +1,55 @@
+---
+- project:
+    name: aai-schema-service-project-view
+    project-name: aai-schema-service
+    views:
+      - project-view
+
+- project:
+    name: aai-schema-service
+    project-name: 'aai-schema-service'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'aai-schema-service/pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+          build-node: ubuntu1604-docker-8c-8g
+    project: 'aai/schema-service'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-schema-service-settings'
+    mvn-version: 'mvn35'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aai-schema-service-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'aai/resources'
+    project-name: 'aai-schema-service'
+    branch: 'casablanca'
+    mvn-settings: 'aai-schema-service-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn35'
+
+- project:
+    name: aai-schema-service-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'aai/resources'
+    project-name: 'aai-schema-service'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-schema-service-settings'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index dd4f29c91..bd44eb4fa 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -46,5 +46,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/search-data-service'
     project-name: 'aai-search-data-service'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-search-data-service-settings'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 4e43985fc..2a9c88631 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -46,5 +46,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/sparky-be'
     project-name: 'aai-sparky-be'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index ec4f61b2b..5dd744b34 100644
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -46,5 +46,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/spike'
     project-name: 'aai-spike'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-spike-settings'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index e7f9594d6..83acb9e26 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -50,6 +50,8 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/traversal'
     project-name: 'aai-traversal'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index 8c6776be4..ea7319c71 100644
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -1,5 +1,11 @@
 ---
 - project:
+    name: aai-validation-project-view
+    project-name: aai-validation
+    views:
+      - project-view
+
+- project:
     name: aai-validation
     project-name: 'aai-validation'
     jobs:
@@ -41,5 +47,8 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/validation'
     project-name: 'aai-validation'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-validation-settings'
+