6 files changed, 45 insertions, 7 deletions
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 762df8528..cd324f93d 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -7,9 +7,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily'
 
     project: 'aai/esr-server'
     stream:
@@ -18,4 +16,6 @@
     mvn-settings: 'aai-esr-server-settings'
     files: '**'
     archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
index f20d65b60..f5a283a32 100644
--- a/jjb/msb/msb-csit.yaml
+++ b/jjb/msb/msb-csit.yaml
@@ -10,6 +10,9 @@
       - 'sanity-check':
           trigger_jobs:
             - 'msb-discovery-master-docker-java-version-shell-daily'
+      - 'rest-service':
+          trigger_jobs:
+            - 'msb-discovery-master-docker-java-version-shell-daily'
       - 'tcp-service':
           trigger_jobs:
             - 'msb-discovery-master-docker-java-version-shell-daily'
diff --git a/jjb/vfc/build-driver-zte-sfc-docker-image.sh b/jjb/vfc/build-driver-zte-sfc-docker-image.sh
index d570d18a2..8435ae139 100755
--- a/jjb/vfc/build-driver-zte-sfc-docker-image.sh
+++ b/jjb/vfc/build-driver-zte-sfc-docker-image.sh
@@ -5,7 +5,7 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
-chmod 755 ./docker/*.*
+chmod 755 ./zte/sfc-driver/plugin-standalone/src/main/assembly/docker/*.*
 
-./docker/build_image.sh
+./zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh
 
diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
index 417082b98..89860d94c 100755
--- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
@@ -8,5 +8,5 @@ echo $CURRENTDIR
 chmod 755 ./zte/vmanager/docker/*.*
 ./zte/vmanager/docker/build_image.sh
 
-chmod 755 ./VnfmadapterService/docker/*.*
-./VnfmadapterService/docker/build_image.sh
+chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.*
+./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
new file mode 100644
index 000000000..8a4269cb7
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: vfc-nfvo-catalog-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-catalog'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+            - 'vfc-nfvo-catalog-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'
+\ No newline at end of file
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
new file mode 100644
index 000000000..39135eb50
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: vnfsdk-validation
+    project-name: 'vnfsdk-validation'
+    jobs:
+    - '{project-name}-{stream}-clm'
+    - '{project-name}-{stream}-verify-java'
+    - '{project-name}-{stream}-merge-java'
+    - '{project-name}-{stream}-release-version-java-daily'
+    - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'vnfsdk/validation'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vnfsdk-validation-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g