From d01c1deb155498ba8e1728648e2284f8afd7f0c8 Mon Sep 17 00:00:00 2001
From: HuabingZhao <zhao.huabing@zte.com.cn>
Date: Sat, 19 Aug 2017 13:17:00 +0800
Subject: Jenkis job for apigateway and discovery dockers

Issue-Id: MSB-18, MSB-19
Change-Id: I5c285685dbe76ca63df364e2c5461fc0189e18bd
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
---
 jjb/msb/build-apigateway-docker-image.sh | 12 ++++++++++++
 jjb/msb/build-discovery-docker-image.sh  | 11 +++++++++++
 jjb/msb/build-docker-image.sh            | 12 ------------
 jjb/msb/msb-apigateway.yaml              |  2 +-
 jjb/msb/msb-discovery.yaml               |  6 +++++-
 5 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 jjb/msb/build-apigateway-docker-image.sh
 create mode 100644 jjb/msb/build-discovery-docker-image.sh
 delete mode 100644 jjb/msb/build-docker-image.sh

diff --git a/jjb/msb/build-apigateway-docker-image.sh b/jjb/msb/build-apigateway-docker-image.sh
new file mode 100644
index 000000000..6ca48a2c7
--- /dev/null
+++ b/jjb/msb/build-apigateway-docker-image.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 *.*
+
+./build4basedocker.sh
+./build4docker.sh
+
diff --git a/jjb/msb/build-discovery-docker-image.sh b/jjb/msb/build-discovery-docker-image.sh
new file mode 100644
index 000000000..ae7f5a275
--- /dev/null
+++ b/jjb/msb/build-discovery-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 *.*
+
+./build4docker.sh
+
diff --git a/jjb/msb/build-docker-image.sh b/jjb/msb/build-docker-image.sh
deleted file mode 100644
index 6ca48a2c7..000000000
--- a/jjb/msb/build-docker-image.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 *.*
-
-./build4basedocker.sh
-./build4docker.sh
-
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 54f178562..69042cb5f 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -14,7 +14,7 @@
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
-            !include-raw-escape: 'build-docker-image.sh'
+            !include-raw-escape: 'build-apigateway-docker-image.sh'
 
     project: 'msb/apigateway'
     stream:
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index f35572caa..bb20c4b03 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -10,7 +10,11 @@
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-discovery-docker-image.sh'
     project: 'msb/discovery'
     stream:
       - 'master':
-- 
cgit 1.2.3-korg