From f6bd722e2caa6dcd4f88f2e377e856e9165d03a1 Mon Sep 17 00:00:00 2001 From: Kevin Leimkuhler Date: Thu, 18 Jun 2020 00:32:01 -0400 Subject: [PATCH] Fix install-pr script (#4610) * Fix install-pr script * Add image-archives path to commands to use the files Signed-off-by: Kevin Leimkuhler Signed-off-by: Charles Pretzer Co-authored-by: Charles Pretzer --- bin/install-pr | 6 +++--- test/install_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/install-pr b/bin/install-pr index 829c0b52a..91424c3c9 100755 --- a/bin/install-pr +++ b/bin/install-pr @@ -80,11 +80,11 @@ cd "$dir" || exit echo "### Downloading images ###" curl -L -o archive.zip -H "$auth" "$archive" -unzip -o archive.zip +unzip -o archive.zip -d image-archives/ echo "### Loading images into Docker ###" -image=$(docker load -i cli-bin.tar | sed 's/Loaded image: //') +image=$(docker load -i image-archives/cli-bin.tar | sed 's/Loaded image: //') tag=$(echo "$image" | cut -f 2 -d ":") if [ $is_kind ] @@ -99,7 +99,7 @@ then else for image in cni-plugin controller debug grafana proxy web do - image=$(docker load -i "$image.tar" | sed 's/Loaded image: //') + image=$(docker load -i "image-archives/$image.tar" | sed 's/Loaded image: //') docker push "$image" done fi diff --git a/test/install_test.go b/test/install_test.go index b112524ae..e5e0cbb48 100644 --- a/test/install_test.go +++ b/test/install_test.go @@ -655,7 +655,7 @@ func TestInject(t *testing.T) { } func TestServiceProfileDeploy(t *testing.T) { - bbProto, err := TestHelper.HTTPGetURL("https://raw.githubusercontent.com/BuoyantIO/bb/55b78f210c98a7eb431c3f555cf0a406f0b12edf/api.proto") + bbProto, err := TestHelper.HTTPGetURL("https://raw.githubusercontent.com/BuoyantIO/bb/v0.0.5/api.proto") if err != nil { testutil.AnnotatedFatalf(t, "unexpected error", "unexpected error: %v %s", err, bbProto)