From e4c3dbf49b5abb60d3f2ef227a969b6c762481b5 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 13 Nov 2019 03:25:06 +0200 Subject: [PATCH] test: try using azurite 3.3.0-preview Azurite was updated [2] to support new SAS tokens, so we no longer need to downgrade azure-storage-blob for our tests. [1] https://github.com/iterative/dvc/issues/2387 [2] https://github.com/Azure/Azurite/issues/250 --- scripts/ci/install.sh | 6 ------ scripts/ci/install_azurite.sh | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index 86d10fef01..d00d43c12b 100644 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -10,12 +10,6 @@ scriptdir="$(dirname $0)" # work or not. $scriptdir/retry.sh pip install --upgrade pip setuptools wheel $scriptdir/retry.sh pip install .[all,tests] -# Installing specific packages to workaround some bugs. Please see [1] and [2] -# -# [1] https://github.com/iterative/dvc/issues/2284 -# [2] https://github.com/iterative/dvc/issues/2387 -$scriptdir/retry.sh pip uninstall -y azure-storage-blob -$scriptdir/retry.sh pip install psutil azure-storage-blob==1.5.0 git config --global user.email "dvctester@example.com" git config --global user.name "DVC Tester" diff --git a/scripts/ci/install_azurite.sh b/scripts/ci/install_azurite.sh index ad6d23e71d..813d5c03b3 100755 --- a/scripts/ci/install_azurite.sh +++ b/scripts/ci/install_azurite.sh @@ -13,7 +13,7 @@ set -x # run azurite sudo docker run -d --restart always -e executable=blob -p 10000:10000 \ --tmpfs /opt/azurite/folder \ - mcr.microsoft.com/azure-storage/azurite:3.1.2-preview \ + mcr.microsoft.com/azure-storage/azurite:3.3.0-preview \ azurite -l /data --blobHost 0.0.0.0 # save secrets