3 files changed, 14 insertions, 8 deletions
diff --git a/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh
new file mode 100644
index 000000000..495220f26
--- /dev/null
+++ b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./activiti-extension/src/main/docker/*.sh
+./activiti-extension/src/main/docker/activiti-docker-build_image.sh
+
diff --git a/jjb/vfc/build-nfvo-wfengine-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh
index de7d13bd1..3a27413df 100644
--- a/jjb/vfc/build-nfvo-wfengine-docker-image.sh
+++ b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh
@@ -5,9 +5,6 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
-chmod 755 ./activiti-extension/src/main/docker/*.sh
-./activiti-extension/src/main/docker/activiti-docker-build_image.sh
-
 chmod 755 ./wfenginemgrservice/src/main/docker/*.sh
 ./wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
 
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 8759a56d0..b25c43922 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -12,18 +12,17 @@
       - 'engine-mgr-service':
           pom: 'wfenginemgrservice/pom.xml'
           pattern: 'wfenginemgrservice/**'
+          script: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh'
       - 'engine-activiti-extension':
           pom: 'activiti-extension/pom.xml'
           pattern: 'activiti-extension/**'
+          script: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-nfvo-wfengine-docker-image.sh'
+      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
+          mvn-goals: 'clean'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g