8 files changed, 69 insertions, 3 deletions
diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
new file mode 100644
index 000000000..41a6805f6
--- /dev/null
+++ b/jjb/aai/aai-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    name: aai-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'aai'
+    stream: 'master'
+    functionality:
+      - 'search-data-service':
+          trigger_jobs:
+    robot-options: ''
+    branch: 'master'
diff --git a/jjb/msb/build-docker-image.sh b/jjb/msb/build-apigateway-docker-image.sh
index 6ca48a2c7..6ca48a2c7 100644
--- a/jjb/msb/build-docker-image.sh
+++ b/jjb/msb/build-apigateway-docker-image.sh
diff --git a/jjb/msb/build-discovery-docker-image.sh b/jjb/msb/build-discovery-docker-image.sh
new file mode 100644
index 000000000..ae7f5a275
--- /dev/null
+++ b/jjb/msb/build-discovery-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 *.*
+
+./build4docker.sh
+
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 54f178562..69042cb5f 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -14,7 +14,7 @@
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
-            !include-raw-escape: 'build-docker-image.sh'
+            !include-raw-escape: 'build-apigateway-docker-image.sh'
 
     project: 'msb/apigateway'
     stream:
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index f35572caa..bb20c4b03 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -10,7 +10,11 @@
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-discovery-docker-image.sh'
     project: 'msb/discovery'
     stream:
       - 'master':
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
new file mode 100644
index 000000000..3f3544031
--- /dev/null
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+    name: msb-java-sdk
+    project-name: 'msb-java-sdk'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    project: 'msb/java-sdk'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'msb-java-sdk-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 304f7ce36..e50cffa90 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -3,7 +3,8 @@
     name: policy-engine
     project-name: 'policy-engine'
     jobs:
-      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-clm':
+          build-node: 'ubuntu1604-basebuild-4c-4g'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
new file mode 100644
index 000000000..834d2a898
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -0,0 +1,21 @@
+---
+
+- project:
+    name: vfc-nfvo-catalog
+    project-name: 'vfc-nfvo-catalog'
+    project: 'vfc/nfvo/catalog'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-catalog-settings'
+    subproject:
+      - 'catalog':
+          path: '.'
+          pattern: '**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-redis-4c-4g
+\ No newline at end of file