run test suites with 2.5 binaries and images (#906)

* run test suites with 2.5 binaries and images

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

* Swap to use the Helper Function to create policies (#907)

The old way used the direct protobuf functions, there is a helper function
in the chaincode does exactly that.

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
Co-authored-by: Matthew B White <whitemat@uk.ibm.com>

.github/actions/test-network-setup/action.yaml

@@ -10,6 +10,12 @@ inputs:
   java-version:
     description: Version of JDK
     default: 11.x
+  fabric-version:
+    description: Version of Hyperledger Fabric
+    default: 2.5.0-alpha3
+  ca-version:
+    description: Version of Hyperledger Fabric CA
+    default: 1.5.6-beta3
 
 runs:
   using: "composite"
@@ -35,12 +41,15 @@ runs:
     - name: Install fabric CLI
       shell: bash
       run: |
-        curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary
+        curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh \
+          | bash -s -- binary --fabric-version ${{ inputs.fabric-version }} --ca-version ${{ inputs.ca-version }}
         echo ${PWD}/bin >> $GITHUB_PATH
 
     - name: Pull Fabric Docker Images
       shell: bash
-      run: curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- docker
+      run: |
+        curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh \
+          | bash -s -- docker --fabric-version ${{ inputs.fabric-version }} --ca-version ${{ inputs.ca-version }}
 
     - name: Install retry CLI
       shell: bash

.github/workflows/lint.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is linting fabric-samples 🎉
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 env:
   GO_VER: 1.18.3

.github/workflows/rest-sample.yaml

@@ -10,10 +10,10 @@ env:
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
     paths: [ "asset-transfer-basic/rest-api-typescript/**" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
     paths: [ "asset-transfer-basic/rest-api-typescript/**" ]
 
 jobs:

.github/workflows/test-fsat.yaml

@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
       - "main"
+      - "release-2.5"
     paths:
       - "full-stack-asset-transfer-guide/**"
 

.github/workflows/test-network-basic.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Basic tests 🔎
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   basic:

.github/workflows/test-network-events.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Events tests 💡
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   events:

.github/workflows/test-network-gateway.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Gateway tests 🖥️
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   gateway:

.github/workflows/test-network-hsm.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network HSM tests 🍏
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   hsm:

.github/workflows/test-network-k8s.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is testing the Kubernetes Test Network 🍒
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   ccaas-java:

.github/workflows/test-network-ledger.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Ledger tests 🥑
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   basic:

.github/workflows/test-network-off-chain.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Off Chain tests 🍔
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   off-chain:

.github/workflows/test-network-private.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Private tests 🔒
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   private:

.github/workflows/test-network-sbe.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network SBE tests 🎵
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   SBE:

.github/workflows/test-network-secured.yaml

@@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Secured tests 🔔
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release-2.5" ]
 
 jobs:
   secured:

asset-transfer-sbe/chaincode-typescript/package.json

@@ -21,8 +21,8 @@
   "author": "Hyperledger",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-contract-api": "^2.0.0",
+    "fabric-contract-api": "^2.5.0",
-    "fabric-shim": "^2.0.0"
+    "fabric-shim": "^2.5.0"
   },
   "devDependencies": {
     "@types/chai": "^4.2.11",