7 files changed, 37 insertions, 9 deletions
diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
index c6bec58ec..884c3706b 100644
--- a/jjb/doc/doc-templates-rtd.yaml
+++ b/jjb/doc/doc-templates-rtd.yaml
@@ -58,7 +58,11 @@
     builders:
       - shell: |
           if [ "$GERRIT_PROJECT" != "doc" ]; then
-              cd docs/submodules/$GERRIT_PROJECT
+              if [ -d docs/submodules/$GERRIT_PROJECT.git ]; then
+                  cd docs/submodules/$GERRIT_PROJECT.git
+              else
+                  cd docs/submodules/$GERRIT_PROJECT
+              fi
               git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
           else
               git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
diff --git a/jjb/vfc/build-driver-ems-docker-image.sh b/jjb/vfc/build-driver-ems-docker-image.sh
index b81ad521c..6804198b5 100755
--- a/jjb/vfc/build-driver-ems-docker-image.sh
+++ b/jjb/vfc/build-driver-ems-docker-image.sh
@@ -5,7 +5,7 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
-chmod 755 ./ems/docker/*.*
+chmod 755 ./ems/microservice-standalone/src/main/assembly/docker/*.*
 
-./ems/docker/build_image.sh
+./ems/microservice-standalone/src/main/assembly/docker/build_image.sh
 
diff --git a/jjb/vfc/build-gvnfm-driver-docker-image.sh b/jjb/vfc/build-gvnfm-driver-docker-image.sh
new file mode 100755
index 000000000..3560e41df
--- /dev/null
+++ b/jjb/vfc/build-gvnfm-driver-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./gvnfmadapter/docker/*.*
+
+./gvnfmadapter/docker/build_image.sh
+
diff --git a/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh b/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh
index b16fa2deb..b16fa2deb 100644..100755
--- a/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh
+++ b/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh
diff --git a/jjb/vfc/build-nfvo-resmanagement-docker-image.sh b/jjb/vfc/build-nfvo-resmanagement-docker-image.sh
new file mode 100755
index 000000000..539ea3e52
--- /dev/null
+++ b/jjb/vfc/build-nfvo-resmanagement-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./ResmanagementService/docker/*.*
+
+./ResmanagementService/docker/build_image.sh
+
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 0d57efa2d..5dbd4fe8d 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -15,9 +15,11 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
 \ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 2eea1a652..ecab6e123 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -8,13 +8,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     build-node: ubuntu1604-basebuild-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'