Change Fabric Binary Pull Logic (hyperledger#147)

Signed-off-by: Brett Logan <[email protected]>
SamYuan1990 · Mar 31, 2020 · 0e3a7a7 · 0e3a7a7
1 parent 337f82c
commit 0e3a7a7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@
 /config
 .DS_Store
 .project
+.idea
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,4 @@ @@
     /config
     .DS_Store
     .project
+    .idea