diff options
Diffstat (limited to 'code')
| -rwxr-xr-x | code/install_interface_patch.sh | 8 | ||||
| -rwxr-xr-x | code/jasmine/autogen.sh | 9 | ||||
| -rwxr-xr-x | code/makefile_patch.sh | 8 |
3 files changed, 15 insertions, 10 deletions
diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh index a2d13776..0b869f07 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="180113131526" +imagebranch="queens" +imageversion="180410142414" imageserver="http://artifacts.opnfv.org/daisy/upstream" imagedir="/var/lib/daisy/versionfile/kolla" imagename="kolla-image-$imagebranch-$imageversion.tgz" @@ -17,9 +17,7 @@ mkdir -p $imagedir if [ ! -e "$imagedir/$imagename" ];then cp $imagename $imagedir fi -if [ ! -e "$imagedir/registry-server.tar" ];then - cp registry-server.tar $imagedir -fi + cp CentOS*.iso /var/lib/daisy/kolla mkdir -p /var/lib/daisy/images/ diff --git a/code/jasmine/autogen.sh b/code/jasmine/autogen.sh index 5bf25ecc..d99fe580 100755 --- a/code/jasmine/autogen.sh +++ b/code/jasmine/autogen.sh @@ -1,4 +1,13 @@ #!/bin/sh +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + # Run this to generate all the initial makefiles, etc. mkdir -p m4 echo Building configuration system... diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh index e9ed9e4a..150bf84d 100755 --- a/code/makefile_patch.sh +++ b/code/makefile_patch.sh @@ -12,12 +12,12 @@ TOOLS_PATH=$1 CACHE_PATH=/home/cache -imagebranch="pike" -imageversion="180113131526" +imagebranch="queens" +imageversion="180410142414" imageserver="http://artifacts.opnfv.org/daisy/upstream" imagename="kolla-image-$imagebranch-$imageversion.tgz" -isoname="CentOS-7-x86_64-Minimal-1611.iso" +isoname="CentOS-7-x86_64-Minimal-1802-01.iso" isourl="http://buildlogs.centos.org/rolling/7/isos/x86_64/${isoname}" cirros_server="http://download.cirros-cloud.net" @@ -129,12 +129,10 @@ function check_or_download_file_sha512sum() if [ ! -d $CACHE_PATH ]; then mkdir -p $CACHE_PATH ; fi check_or_download_file $CACHE_PATH $isourl check_or_download_file_sha512sum $CACHE_PATH $imageserver/${imagename} ${imageserver}/${imagename}.sha512sum -check_or_download_file $CACHE_PATH "http://daisycloud.org/static/files/registry-server.tar" check_or_download_file $CACHE_PATH ${cirros_url} cp $CACHE_PATH/${isoname} ${target_dir}/ cp $CACHE_PATH/$imagename ${target_dir}/ -cp $CACHE_PATH/registry-server.tar ${target_dir}/ cp $CACHE_PATH/${cirros_filename} ${target_dir}/ cp $TOOLS_PATH/setup/install_interface_patch.sh ${target_dir}/ |