diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2018-04-05 23:10:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-05 23:10:14 +0000 |
| commit | c093da4721d9f786f2ca9767c8eba4047708fae4 (patch) | |
| tree | 16220be61b41cde072d34855415788c64ab9fe83 | |
| parent | 7c7dab2f33becdf3c32ba15e5549207b8e793aac (diff) | |
| parent | 46fe1b25f49dc0385ad0c81098ca34e96364f30c (diff) | |
Merge "re-point to upstream stable/queens"
| -rwxr-xr-x | ci/build_rpm/build_rpms_docker.sh | 2 | ||||
| -rwxr-xr-x | code/install_interface_patch.sh | 4 | ||||
| -rwxr-xr-x | code/makefile_patch.sh | 4 |
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" |