From: luxin <luxin7@huawei.com>
Date: Tue, 5 Sep 2017 07:21:43 +0000 (+0800)
Subject: Fix vfc-resmanagement build docker job
X-Git-Tag: 1.0.0-Amsterdam~236^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d719e8bd9bc668bbe2e46933c28b350040442573;p=ci-management.git

Fix vfc-resmanagement build docker job

Fix build docker job and remove unused stream in yaml
add build docker shell file

Change-Id: I22c903af08a9d92885537e9c49643e59004d97f4
Issue-Id:VFC-273
Signed-off-by: luxin <luxin7@huawei.com>
---

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'