From 0e3a7a7a30d30db948dd7e85660b558a87f8cc73 Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Tue, 31 Mar 2020 10:02:06 -0400 Subject: [PATCH] Change Fabric Binary Pull Logic (#147) Signed-off-by: Brett Logan --- .gitignore | 1 + ci/azure-pipelines.yml | 1 + ci/install-fabric.yml | 8 +++----- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4b705ae4..44c5828f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /config .DS_Store .project +.idea \ No newline at end of file diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index def2c1bc..f884ecc6 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -8,6 +8,7 @@ trigger: variables: NODE_VER: '10.x' + PATH: $(Agent.BuildDirectory)/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin jobs: - job: fabcar_go diff --git a/ci/install-fabric.yml b/ci/install-fabric.yml index 6f8db50e..aab70306 100644 --- a/ci/install-fabric.yml +++ b/ci/install-fabric.yml @@ -5,17 +5,15 @@ steps: - script: | set -eo pipefail - wget -q -P /tmp https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-linux-amd64-1.4.5-stable.tar.gz - sudo tar xzvf /tmp/hyperledger-fabric-linux-amd64-1.4.5-stable.tar.gz -C /usr/local + curl -L --retry 5 --retry-delay 3 https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-linux-amd64-1.4-stable.tar.gz | tar xz displayName: Download Fabric CLI - script: | set -eo pipefail - wget -q -P /tmp https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-ca-linux-amd64-1.4.5-stable.tar.gz - sudo tar xzvf /tmp/hyperledger-fabric-ca-linux-amd64-1.4.5-stable.tar.gz -C /usr/local + curl -L --retry 5 --retry-delay 3 https://hyperledger.jfrog.io/hyperledger/fabric-binaries/hyperledger-fabric-ca-linux-amd64-1.4-stable.tar.gz | tar xz displayName: Download Fabric CA CLI - script: | set -ex - version=1.4.5 + version=1.4 for i in ca ccenv javaenv peer orderer tools; do docker pull hyperledger-fabric.jfrog.io/fabric-$i:amd64-$version-stable docker tag hyperledger-fabric.jfrog.io/fabric-$i:amd64-$version-stable hyperledger/fabric-$i:amd64-$version-stable