aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2017-03-21 01:23:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-21 01:23:48 +0000
commitd742db328b70415c726ae9ed0aa7f16d79d7c852 (patch)
treebc6a716638dd99c85a4361550d2b3dc694d97f68 /tools
parent59a633933aa9cfd9d807cdfa9e11187990921e85 (diff)
parentfe655f15b0838b41c8c91543898ceebf23f1494c (diff)
Merge "Bugfix: replace MD5SUM with SHA256SUMs"
Diffstat (limited to 'tools')
-rw-r--r--tools/yardstick-img-dpdk-modify12
-rwxr-xr-xtools/yardstick-img-lxd-modify12
-rwxr-xr-xtools/yardstick-img-modify12
3 files changed, 18 insertions, 18 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 -
diff --git a/tools/yardstick-img-lxd-modify b/tools/yardstick-img-lxd-modify
index 4ca4eb489..b977d2a52 100755
--- a/tools/yardstick-img-lxd-modify
+++ b/tools/yardstick-img-lxd-modify
@@ -44,8 +44,8 @@ host=${HOST:-"cloud-images.ubuntu.com"}
release=${RELEASE:-"xenial"}
image_path="${release}/current/${release}-server-cloudimg-amd64-root.tar.gz"
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-image.tar.gz"
filename=$(basename $image_url)
@@ -54,14 +54,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 --progress=dot:giga $image_url
- grep $filename MD5SUMS | md5sum -c ||
+ grep $filename SHA256SUMS | sha256sum -c ||
if [ $? -ne 0 ]; then
rm $filename
wget -nc --progress=dot:giga $image_url
- grep $filename MD5SUMS | md5sum -c
+ grep $filename SHA256SUMS | sha256sum -c
fi
cd -
}
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index b4f632bb2..658717c71 100755
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -48,8 +48,8 @@ fi
image_path="${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}-${boot_mode}.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-image.img"
raw_imgfile_basename="yardstick-${release}-server.raw"
@@ -62,14 +62,14 @@ apt-get install -y parted
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 --progress=dot:giga $image_url
- grep $filename MD5SUMS | md5sum -c ||
+ grep $filename SHA256SUMS | sha256sum -c ||
if [ $? -ne 0 ]; then
rm $filename
wget -nc --progress=dot:giga $image_url
- grep $filename MD5SUMS | md5sum -c
+ grep $filename SHA256SUMS | sha256sum -c
fi
for i in $(seq 0 9); do