summaryrefslogtreecommitdiffstats
path: root/jjb/vfc
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2017-09-06 04:50:53 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-06 04:50:53 +0000
commit1bc50c40df8d1b13296ccadb393fda1e17ec82ce (patch)
treeb74159109d094c677d416d5296472cb5a110f573 /jjb/vfc
parenta8040afded6b6da26559e9ad4a7ed256ec9d8c25 (diff)
parentd719e8bd9bc668bbe2e46933c28b350040442573 (diff)
Merge "Fix vfc-resmanagement build docker job"
Diffstat (limited to 'jjb/vfc')
-rwxr-xr-xjjb/vfc/build-nfvo-resmanagement-docker-image.sh11
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml8
2 files changed, 15 insertions, 4 deletions
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'