Fix to upstream stable/pike branch 33/54633/4
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Fri, 30 Mar 2018 02:51:02 +0000 (10:51 +0800)
committerAlex Yang <yangyang1@zte.com.cn>
Fri, 30 Mar 2018 06:00:37 +0000 (06:00 +0000)
To satisfy security check, DAISYCORE_REPO and DAISYCORE_TAG are
deleted.

Change-Id: Ib3cf4c50a417f28502c4e3115f47429065620ca1
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
ci/build_rpm/build_rpms_docker.sh

index 3ea90ea..0b48894 100755 (executable)
@@ -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