Merge pull request #291 from hyperledger/e2e

Fix fabric-tools and update E2E matrix
hyperledger · Mar 1, 2024 · 99626b3 · 99626b3
2 parents b8ec3e5 + c71842f
commit 99626b3
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 21 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -10,27 +10,72 @@ jobs:
   e2e-test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        test-suite: [TestEthereumE2ESuite, TestFabricE2ESuite]
-        blockchain-provider: [geth, fabric, besu]
-        token-provider: [none, erc1155, erc20_erc721]
-        database-type: [sqlite3, postgres]
-        exclude:
-          - blockchain-provider: geth
-            test-suite: TestFabricE2ESuite
-          - blockchain-provider: besu
-            test-suite: TestFabricE2ESuite
-          - blockchain-provider: fabric
-            test-suite: TestEthereumE2ESuite
-          - blockchain-provider: fabric
+        stack-type: [ethereum, fabric]
+        exclude: [stack-type: ethereum, stack-type: fabric]
+        include:
+          - stack-type: ethereum
+            blockchain-connector: evmconnect
+            test-suite: TestEthereumMultipartyE2ESuite
+            database-type: sqlite3
+            token-provider: erc20_erc721
+            multiparty-enabled: true
+
+          - stack-type: ethereum
+            blockchain-connector: evmconnect
+            test-suite: TestEthereumMultipartyE2ESuite
+            database-type: postgres
+            token-provider: erc20_erc721
+            multiparty-enabled: true
+
+          - stack-type: ethereum
+            blockchain-connector: evmconnect
+            test-suite: TestEthereumMultipartyE2ESuite
+            database-type: sqlite3
             token-provider: erc1155
-          - blockchain-provider: fabric
+            multiparty-enabled: true
+
+          - stack-type: ethereum
+            blockchain-connector: evmconnect
+            test-suite: TestEthereumMultipartyTokensRemoteNameE2ESuite
+            database-type: postgres
             token-provider: erc20_erc721
-          - blockchain-provider: geth
+            multiparty-enabled: true
+
+          - stack-type: fabric
+            test-suite: TestFabricE2ESuite
+            database-type: sqlite3
             token-provider: none
-          - blockchain-provider: besu
+            multiparty-enabled: true
+
+          - stack-type: ethereum
+            blockchain-connector: evmconnect
+            test-suite: TestEthereumGatewayE2ESuite
+            database-type: sqlite3
+            token-provider: erc20_erc721
+            multiparty-enabled: false
+
+          - stack-type: fabric
+            test-suite: TestFabricGatewayE2ESuite
+            database-type: sqlite3
             token-provider: none
-      fail-fast: false
+            multiparty-enabled: false
+
+          - stack-type: ethereum
+            blockchain-connector: ethconnect
+            test-suite: TestEthereumMultipartyE2ESuite
+            database-type: sqlite3
+            token-provider: erc20_erc721
+            multiparty-enabled: true
+
+          - stack-type: ethereum
+            blockchain-connector: ethconnect
+            test-suite: TestEthereumGatewayLegacyEthE2ESuite
+            database-type: sqlite3
+            token-provider: erc1155
+            multiparty-enabled: false
+
     steps:
       - name: Checkout FireFly CLI
         uses: actions/checkout@v4
@@ -56,15 +101,16 @@ jobs:
         working-directory: firefly
         env:
           TEST_SUITE: ${{ matrix.test-suite }}
-          BLOCKCHAIN_PROVIDER: ${{ matrix.blockchain-provider }}
+          STACK_TYPE: ${{ matrix.stack-type }}
+          BLOCKCHAIN_CONNECTOR: ${{ matrix.blockchain-connector }}
           TOKENS_PROVIDER: ${{ matrix.token-provider }}
           DATABASE_TYPE: ${{ matrix.database-type }}
-          DOWNLOAD_CLI: false
+          MULTIPARTY_ENABLED: ${{ matrix.multiparty-enabled }}
         run: ./test/e2e/run.sh
 
       - name: Archive container logs
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: container-logs-${{ matrix.test-suite }}-${{ matrix.blockchain-provider }}-${{ matrix.database-type }}-${{ matrix.token-provider }}
+          name: container-logs-${{ matrix.test-suite }}-${{ matrix.blockchain-provider }}-${{ matrix.blockchain-connector }}-${{ matrix.database-type }}-${{ matrix.token-provider }}
           path: containerlogs/logs.txt
diff --git a/internal/blockchain/fabric/constants.go b/internal/blockchain/fabric/constants.go
@@ -16,7 +16,7 @@
 
 package fabric
 
-var FabricToolsImageName = "hyperledger/fabric-tools:2.5"
+var FabricToolsImageName = "hyperledger/fabric-tools:2.5.6"
 var FabricCAImageName = "hyperledger/fabric-ca:1.5"
 var FabricOrdererImageName = "hyperledger/fabric-orderer:2.5"
 var FabricPeerImageName = "hyperledger/fabric-peer:2.5"
diff --git a/internal/blockchain/fabric/fabric_provider.go b/internal/blockchain/fabric/fabric_provider.go
@@ -126,7 +126,7 @@ func (p *FabricProvider) FirstTimeSetup() error {
 			"--platform", getDockerPlatform(),
 			"--rm",
 			"-v", fmt.Sprintf("%s:/etc/firefly", volumeName),
-			"-v", fmt.Sprintf("%s:/var/hyperledger/fabric/config/configtx.yaml", path.Join(blockchainDirectory, "configtx.yaml")),
+			"-v", fmt.Sprintf("%s:/etc/hyperledger/fabric/configtx.yaml", path.Join(blockchainDirectory, "configtx.yaml")),
 			FabricToolsImageName,
 			"configtxgen",
 			"-outputBlock", "/etc/firefly/firefly.block",