From ad447a411f78e4b15b32d800fbafa5a57c720336 Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Mon, 8 Feb 2021 00:27:11 -0500 Subject: [PATCH] Update to latest Ubuntu Version in CI Signed-off-by: Brett Logan --- asset-transfer-basic/application-go/go.sum | 2 ++ ci/azure-pipelines.yml | 28 +++++++++---------- .../addOrg3/docker/docker-compose-org3.yaml | 2 +- .../docker/docker-compose-test-net.yaml | 4 +-- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/asset-transfer-basic/application-go/go.sum b/asset-transfer-basic/application-go/go.sum index 19c5b312..1894320d 100644 --- a/asset-transfer-basic/application-go/go.sum +++ b/asset-transfer-basic/application-go/go.sum @@ -83,6 +83,8 @@ github.com/hyperledger/fabric-sdk-go v1.0.0-beta2 h1:FBYygns0Qga+mQ4PXycyTU5m4N9 github.com/hyperledger/fabric-sdk-go v1.0.0-beta2/go.mod h1:/s224b8NLvOJOCIqBvWd9O6u7GE33iuIOT6OfcTE1OE= github.com/hyperledger/fabric-sdk-go v1.0.0-beta3.0.20201006151309-9c426dcc5096 h1:veml7LmfavSHqF8w8z/PGGlfdXvmx5SstQIH6Nyy87c= github.com/hyperledger/fabric-sdk-go v1.0.0-beta3.0.20201006151309-9c426dcc5096/go.mod h1:qWE9Syfg1KbwNjtILk70bJLilnmCvllIYFCSY/pa1RU= +github.com/hyperledger/fabric-sdk-go v1.0.0-rc1 h1:cfDo/5ovUZf2dCz08fznUxxVYEWAT4yKJcAh9b+K9Mk= +github.com/hyperledger/fabric-sdk-go v1.0.0-rc1/go.mod h1:qWE9Syfg1KbwNjtILk70bJLilnmCvllIYFCSY/pa1RU= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo= github.com/jmoiron/sqlx v0.0.0-20180124204410-05cef0741ade/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU= diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 27f8d376..11f521ae 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -17,7 +17,7 @@ jobs: - job: CommercialPaper_Go displayName: Commercial Paper (Go) pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - template: templates/install-deps.yml - template: templates/commercial-paper/azure-pipelines-go.yml @@ -25,7 +25,7 @@ jobs: - job: CommercialPaper_Java displayName: Commercial Paper (Java) pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - template: templates/install-deps.yml - template: templates/commercial-paper/azure-pipelines-java.yml @@ -33,7 +33,7 @@ jobs: - job: CommercialPaper_JavaScript displayName: Commercial Paper (JavaScript) pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - template: templates/install-deps.yml - template: templates/commercial-paper/azure-pipelines-javascript.yml @@ -41,7 +41,7 @@ jobs: - job: FabCar_Go displayName: FabCar (Go) pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - template: templates/install-deps.yml - template: templates/fabcar/azure-pipelines-go.yml @@ -49,7 +49,7 @@ jobs: - job: FabCar_Java displayName: FabCar (Java) pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - template: templates/install-deps.yml - template: templates/fabcar/azure-pipelines-java.yml @@ -57,7 +57,7 @@ jobs: - job: FabCar_JavaScript displayName: FabCar (JavaScript) pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - template: templates/install-deps.yml - template: templates/fabcar/azure-pipelines-javascript.yml @@ -65,7 +65,7 @@ jobs: - job: Fabcar_TypeScript displayName: FabCar (TypeScript) pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - template: templates/install-deps.yml - template: templates/fabcar/azure-pipelines-typescript.yml @@ -73,7 +73,7 @@ jobs: - job: Lint displayName: Lint pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Basic-Application-Go: @@ -152,7 +152,7 @@ jobs: - job: TestNetworkBasic displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Basic-Go: @@ -176,7 +176,7 @@ jobs: - job: TestNetworkLedger displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Ledger-Go: @@ -194,7 +194,7 @@ jobs: - job: TestNetworkPrivate displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Private-Go: @@ -209,7 +209,7 @@ jobs: - job: TestNetworkSBE displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: SBE-Typescript: @@ -227,7 +227,7 @@ jobs: - job: TestNetworkSecured displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Secured-Go: @@ -242,7 +242,7 @@ jobs: - job: TestNetworkEvents displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Events-Javascript: diff --git a/test-network/addOrg3/docker/docker-compose-org3.yaml b/test-network/addOrg3/docker/docker-compose-org3.yaml index 9727e99a..274f736a 100644 --- a/test-network/addOrg3/docker/docker-compose-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-org3.yaml @@ -15,7 +15,7 @@ services: peer0.org3.example.com: container_name: peer0.org3.example.com - image: hyperledger/fabric-peer:$IMAGE_TAG + image: btl5037/peer:2.4.0 environment: #Generic peer variables - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock diff --git a/test-network/docker/docker-compose-test-net.yaml b/test-network/docker/docker-compose-test-net.yaml index c8b3d66d..3dbf28de 100644 --- a/test-network/docker/docker-compose-test-net.yaml +++ b/test-network/docker/docker-compose-test-net.yaml @@ -57,7 +57,7 @@ services: peer0.org1.example.com: container_name: peer0.org1.example.com - image: hyperledger/fabric-peer:$IMAGE_TAG + image: btl5037/peer:2.4.0 environment: #Generic peer variables - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock @@ -95,7 +95,7 @@ services: peer0.org2.example.com: container_name: peer0.org2.example.com - image: hyperledger/fabric-peer:$IMAGE_TAG + image: btl5037/peer:2.4.0 environment: #Generic peer variables - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock