From 2b47c9f0c00788a82a8eabf6d0f8bee81b4c430f Mon Sep 17 00:00:00 2001 From: Arnaud J Le Hors Date: Thu, 2 Sep 2021 11:26:14 +0200 Subject: [PATCH] Update Compose Spec & VM Spec Version (#482) Based on PR 449 by Brett Logan Signed-off-by: Arnaud J Le Hors --- ci/azure-pipelines.yml | 28 +++++++++---------- .../docker/docker-compose-ca-org3.yaml | 2 +- .../docker/docker-compose-couch-org3.yaml | 2 +- .../addOrg3/docker/docker-compose-org3.yaml | 2 +- test-network/docker/docker-compose-ca.yaml | 2 +- test-network/docker/docker-compose-couch.yaml | 2 +- .../docker/docker-compose-test-net.yaml | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index ea01dbe7..6b1908f1 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 steps: - task: GoTool@0 inputs: @@ -92,7 +92,7 @@ jobs: - job: TestNetworkBasic displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Basic-Go: @@ -118,7 +118,7 @@ jobs: - job: TestNetworkLedger displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Ledger-Go: @@ -136,7 +136,7 @@ jobs: - job: TestNetworkPrivate displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Private-Go: @@ -151,7 +151,7 @@ jobs: - job: TestNetworkSBE displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: SBE-Typescript: @@ -169,7 +169,7 @@ jobs: - job: TestNetworkSecured displayName: Test Network pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 strategy: matrix: Secured-Go: @@ -184,7 +184,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-ca-org3.yaml b/test-network/addOrg3/docker/docker-compose-ca-org3.yaml index 7c447fd5..74dbf4d6 100644 --- a/test-network/addOrg3/docker/docker-compose-ca-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-ca-org3.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '2.4' +version: '3.7' networks: test: diff --git a/test-network/addOrg3/docker/docker-compose-couch-org3.yaml b/test-network/addOrg3/docker/docker-compose-couch-org3.yaml index e280ff0f..d10766f3 100644 --- a/test-network/addOrg3/docker/docker-compose-couch-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-couch-org3.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '2.4' +version: '3.7' networks: test: diff --git a/test-network/addOrg3/docker/docker-compose-org3.yaml b/test-network/addOrg3/docker/docker-compose-org3.yaml index 5c394d38..a596ea56 100644 --- a/test-network/addOrg3/docker/docker-compose-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-org3.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '2.4' +version: '3.7' volumes: peer0.org3.example.com: diff --git a/test-network/docker/docker-compose-ca.yaml b/test-network/docker/docker-compose-ca.yaml index 67f17a0c..f678755b 100644 --- a/test-network/docker/docker-compose-ca.yaml +++ b/test-network/docker/docker-compose-ca.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '2.4' +version: '3.7' networks: test: diff --git a/test-network/docker/docker-compose-couch.yaml b/test-network/docker/docker-compose-couch.yaml index e1aab1d3..f67e3a1c 100644 --- a/test-network/docker/docker-compose-couch.yaml +++ b/test-network/docker/docker-compose-couch.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '2.4' +version: '3.7' networks: test: diff --git a/test-network/docker/docker-compose-test-net.yaml b/test-network/docker/docker-compose-test-net.yaml index f156f030..ffafc662 100644 --- a/test-network/docker/docker-compose-test-net.yaml +++ b/test-network/docker/docker-compose-test-net.yaml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # -version: '2.4' +version: '3.7' volumes: orderer.example.com: