diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-03-21 01:56:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-21 01:56:13 +0000 |
| commit | c151f02d0f66b81e6408503b5a4a4737c5f46276 (patch) | |
| tree | 9dde0b672a20cb6e160d73b26fc83a1b5a384ae4 /tools/yardstick-img-dpdk-modify | |
| parent | 1b73cc1efeae88739b4423caf563e3b7574a1804 (diff) | |
| parent | d5ec83c114598b03d60c6efaa17790902521c3a6 (diff) | |
Merge "Bugfix: replace MD5SUM with SHA256SUMs" into stable/danube
Diffstat (limited to 'tools/yardstick-img-dpdk-modify')
| -rw-r--r-- | tools/yardstick-img-dpdk-modify | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/yardstick-img-dpdk-modify b/tools/yardstick-img-dpdk-modify index ec2672d27..9f3d11957 100644 --- a/tools/yardstick-img-dpdk-modify +++ b/tools/yardstick-img-dpdk-modify @@ -44,8 +44,8 @@ host=${HOST:-"cloud-images.ubuntu.com"} release=${RELEASE:-"wily"} image_path="${release}/current/${release}-server-cloudimg-amd64-disk1.img" image_url=${IMAGE_URL:-"https://${host}/${image_path}"} -md5sums_path="${release}/current/MD5SUMS" -md5sums_url=${MD5SUMS_URL:-"https://${host}/${md5sums_path}"} +sha256sums_path="${release}/current/SHA256SUMS" +sha256sums_url=${SHA256SUMS_URL:-"https://${host}/${sha256sums_path}"} imgfile="${workspace}/yardstick-${release}-server" raw_imgfile="${workspace}/yardstick-${release}-server.raw" @@ -55,14 +55,14 @@ filename=$(basename $image_url) download() { test -d $workspace || mkdir -p $workspace cd $workspace - rm -f MD5SUMS # always download the checksum file to a detect stale image - wget $md5sums_url + rm -f SHA256SUMS # always download the checksum file to a detect stale image + wget $sha256sums_url test -e $filename || wget -nc $image_url - grep $filename MD5SUMS | md5sum -c || + grep $filename SHA256SUMS | sha256sum -c || if [ $? -ne 0 ]; then rm $filename wget -nc $image_url - grep $filename MD5SUMS | md5sum -c + grep $filename SHA256SUMS | sha256sum -c fi qemu-img convert $filename $raw_imgfile cd - |