summaryrefslogtreecommitdiffstats
path: root/jjb/vfc
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/vfc')
-rwxr-xr-xjjb/vfc/build-driver-ems-docker-image.sh4
-rwxr-xr-xjjb/vfc/build-nfvo-resmanagement-docker-image.sh11
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml8
3 files changed, 17 insertions, 6 deletions
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-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-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'