From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Wed, 26 Jul 2017 08:39:23 +0000 (-0400)
Subject: Close upstream merge window
X-Git-Tag: opnfv-5.0.RC1~57
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F38131%2F1;p=daisy.git

Close upstream merge window

Switch to upstream daisy's stable/ocata branch

Change-Id: I5ff0b0a28a8d2f76f0cb813af8f8241175bb6054
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---

diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh
index b005a243..cdd2be35 100755
--- a/ci/build_rpm/build_rpms_docker.sh
+++ b/ci/build_rpm/build_rpms_docker.sh
@@ -15,7 +15,7 @@ rpm_output_dir=$rpm_build_dir/build_output
 tmp_rpm_build_dir=/home/cache/daisy4nfv
 
 DAISYCORE_REPO="https://git.openstack.org/openstack/daisycloud-core"
-DAISYCORE_TAG=
+DAISYCORE_TAG="stable/ocata"
 
 if [[ -d $tmp_rpm_build_dir ]]; then
     rm -fr $tmp_rpm_build_dir