Add {subproject}-docker-java-version job
Allow subprojects to build docker separately
Issue-Id: VFC-509
Change-Id: I3c9c8ba8b461d5fe35c79d1187ffdb7190c20700
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
diff --git a/jjb/vfc/build-nfvo-wfengine-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh
similarity index 65%
copy from jjb/vfc/build-nfvo-wfengine-docker-image.sh
copy to jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh
index de7d13b..495220f 100644
--- a/jjb/vfc/build-nfvo-wfengine-docker-image.sh
+++ b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh
@@ -8,6 +8,3 @@
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/build-nfvo-wfengine-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh
similarity index 68%
rename from jjb/vfc/build-nfvo-wfengine-docker-image.sh
rename to jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh
index de7d13b..3a27413 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 @@
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 8759a56..b25c439 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