summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2018-03-30 10:51:02 +0800
committerAlex Yang <yangyang1@zte.com.cn>2018-03-30 06:00:37 +0000
commit8b595f64ed1b995890df62b99f95920a6406b116 (patch)
treeceaf9aec98131b995bb8420a112cf2e827ed1647
parentcfb75182ab0ac2800d556197703847d0d37b2d15 (diff)
Fix to upstream stable/pike branch
To satisfy security check, DAISYCORE_REPO and DAISYCORE_TAG are deleted. Change-Id: Ib3cf4c50a417f28502c4e3115f47429065620ca1 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
-rwxr-xr-xci/build_rpm/build_rpms_docker.sh9
1 files changed, 1 insertions, 8 deletions
diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh
index 3ea90eaf..0b488944 100755
--- a/ci/build_rpm/build_rpms_docker.sh
+++ b/ci/build_rpm/build_rpms_docker.sh
@@ -14,9 +14,6 @@ rpm_build_dir=/opt/daisy4nfv
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=
-
if [[ -d $tmp_rpm_build_dir ]]; then
rm -fr $tmp_rpm_build_dir
fi
@@ -37,11 +34,7 @@ do
cnt=$[cnt + 1]
echo -e "\n\n\n*** Starting build attempt # $cnt"
- if [[ ! -z "$DAISYCORE_TAG" ]]; then
- git clone $DAISYCORE_REPO --branch $DAISYCORE_TAG --depth 1
- else
- git clone $DAISYCORE_REPO --depth 1
- fi
+ git clone https://git.openstack.org/openstack/daisycloud-core --branch stable/pike --depth 1
cp $rpm_build_dir/code/makefile_patch.sh daisycloud-core/tools/setup
cp $rpm_build_dir/code/install_interface_patch.sh daisycloud-core/tools/setup