summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2018-04-03 11:03:06 +0800
committerZhijiang Hu <hu.zhijiang@zte.com.cn>2018-04-03 11:03:06 +0800
commit46fe1b25f49dc0385ad0c81098ca34e96364f30c (patch)
tree56541359827762345dfc259b87711e6a6c4ded1d
parent899b9d234ad7729f98370a73202538715a6bf760 (diff)
re-point to upstream stable/queens
Change-Id: Iee938b95b15a2780f04c118f0bf42e1aeb5cc9ec Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
-rwxr-xr-xci/build_rpm/build_rpms_docker.sh2
-rwxr-xr-xcode/install_interface_patch.sh4
-rwxr-xr-xcode/makefile_patch.sh4
3 files changed, 5 insertions, 5 deletions
diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh
index 0b488944..184860c6 100755
--- a/ci/build_rpm/build_rpms_docker.sh
+++ b/ci/build_rpm/build_rpms_docker.sh
@@ -34,7 +34,7 @@ do
cnt=$[cnt + 1]
echo -e "\n\n\n*** Starting build attempt # $cnt"
- git clone https://git.openstack.org/openstack/daisycloud-core --branch stable/pike --depth 1
+ git clone https://git.openstack.org/openstack/daisycloud-core --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
diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh
index 3a17f414..65bac3fd 100755
--- a/code/install_interface_patch.sh
+++ b/code/install_interface_patch.sh
@@ -8,8 +8,8 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-imagebranch="pike"
-imageversion="180124134113"
+imagebranch="queens"
+imageversion="180401110925"
imageserver="http://artifacts.opnfv.org/daisy/upstream"
imagedir="/var/lib/daisy/versionfile/kolla"
imagename="kolla-image-$imagebranch-$imageversion.tgz"
diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh
index 665b0729..9bde22f0 100755
--- a/code/makefile_patch.sh
+++ b/code/makefile_patch.sh
@@ -12,8 +12,8 @@
TOOLS_PATH=$1
CACHE_PATH=/home/cache
-imagebranch="pike"
-imageversion="180124134113"
+imagebranch="queens"
+imageversion="180401110925"
imageserver="http://artifacts.opnfv.org/daisy/upstream"
imagename="kolla-image-$imagebranch-$imageversion.tgz"