From 6a54cb0cdd4b6a2266134c328a27b9f76e4c2e2f Mon Sep 17 00:00:00 2001
From: Yao Lu <lu.yao135@zte.com.cn>
Date: Tue, 25 Oct 2016 09:04:16 +0800
Subject: add patch of openstack/daisycloud

the patch is about integrate kolla tar and tgz and centos to daisy bin
and cp to appoint path

Change-Id: I3043d2a38f15cdff44f9c777bff8bb5e517684bd
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
---
 ci/build_rpm/Dockerfile           |  3 ++-
 ci/build_rpm/build_rpms_docker.sh | 41 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

(limited to 'ci/build_rpm')

diff --git a/ci/build_rpm/Dockerfile b/ci/build_rpm/Dockerfile
index 63ad0cb5..77aa1a3a 100644
--- a/ci/build_rpm/Dockerfile
+++ b/ci/build_rpm/Dockerfile
@@ -44,4 +44,5 @@ RUN yum -y install \
   python-lesscpy \
   python-migrate \
   python-pint \
-  python-routes
+  python-routes \
+  coreutils
diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh
index 7313d57d..8b5c4096 100755
--- a/ci/build_rpm/build_rpms_docker.sh
+++ b/ci/build_rpm/build_rpms_docker.sh
@@ -9,4 +9,43 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# Implement build (call make allrpm) here
+rpm_build_dir=/opt/daisy4nfv
+rpm_output_dir=$rpm_build_dir/build_output
+tmp_rpm_build_dir=/root/daisy4nfv
+
+cp -r $rpm_build_dir $tmp_rpm_build_dir
+cd $tmp_rpm_build_dir
+
+echo "#########################################################"
+echo "               systemctl info:                   "
+echo "#########################################################"
+echo "###Uname: $(uname)"
+echo "###Hostname: $(hostname)"
+
+maxcount=3
+cnt=0
+rc=1
+while [ $cnt -lt $maxcount ] && [ $rc -ne 0 ]
+do
+    cnt=$[cnt + 1]
+    echo -e "\n\n\n*** Starting build attempt # $cnt"
+
+    git clone https://git.openstack.org/openstack/daisycloud-core
+    cp $tmp_rpm_build_dir/code/makefile_patch.sh daisycloud-core/tools/setup
+    cp $tmp_rpm_build_dir/code/install_interface_patch.sh daisycloud-core/tools/setup
+    cd daisycloud-core/make
+    make allrpm
+    rc=$?
+
+    echo "######################################################"
+    echo "          done              "
+    echo "######################################################"
+    if [ $rc -ne 0 ]; then
+        echo "### Build failed with rc $rc ###"
+    else
+        echo "### Build successfully at attempt # $cnt"
+    fi
+done
+cd ..
+cp target/el7/noarch/installdaisy_el7_noarch.bin $rpm_output_dir
+exit $rc
-- 
cgit 1.2.3-korg