diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index f35ae07ff5..d61430b278 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -28,9 +28,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: + test-suite: [TestEthereumE2ESuite, TestFabricE2ESuite] blockchain-provider: [geth, fabric] database-type: [sqlite3] - test-suite: [TestEthereumE2ESuite, TestFabricE2ESuite] exclude: - blockchain-provider: geth test-suite: TestFabricE2ESuite @@ -56,5 +56,5 @@ jobs: uses: actions/upload-artifact@v2 if: always() with: - name: container-logs + name: container-logs-${{ matrix.test-suite }}-${{ matrix.blockchain-provider }}-${{ matrix.database-type }} path: containerlogs/logs.txt diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml new file mode 100644 index 0000000000..579ec6f7d5 --- /dev/null +++ b/.github/workflows/integration.yml @@ -0,0 +1,53 @@ +name: Latest Integration Test + +on: + push: + branches: [scheduled-e2e] + schedule: + - cron: '0 0 * * *' + workflow_dispatch: + +jobs: + e2e-test: + runs-on: ubuntu-latest + strategy: + matrix: + test-suite: [TestEthereumE2ESuite, TestFabricE2ESuite] + blockchain-provider: [geth, fabric] + database-type: [sqlite3, postgres] + exclude: + - blockchain-provider: geth + test-suite: TestFabricE2ESuite + - blockchain-provider: fabric + test-suite: TestEthereumE2ESuite + fail-fast: false + steps: + - uses: actions/checkout@v2 + + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: 1.16 + + - name: Update manifest to latest commit for every service + run: ./manifestgen.sh head + + - name: Pull latests FireFly build + run: | + docker pull ghcr.io/hyperledger/firefly:head + docker tag ghcr.io/hyperledger/firefly:head hyperledger/firefly + + - name: Run E2E tests + env: + TEST_SUITE: ${{ matrix.test-suite }} + BLOCKCHAIN_PROVIDER: ${{ matrix.blockchain-provider }} + DATABASE_TYPE: ${{ matrix.database-type }} + BUILD_FIREFLY: false + run: ./test/e2e/run.sh + + - name: Archive container logs + uses: actions/upload-artifact@v2 + if: always() + with: + name: container-logs-${{ matrix.test-suite }}-${{ matrix.blockchain-provider }}-${{ matrix.database-type }} + path: containerlogs/logs.txt diff --git a/test/e2e/run.sh b/test/e2e/run.sh index f77ff457af..a6bcb0ccd7 100755 --- a/test/e2e/run.sh +++ b/test/e2e/run.sh @@ -67,7 +67,7 @@ if [ "$BUILD_FIREFLY" == "true" ]; then fi if [ "$DOWNLOAD_CLI" == "true" ]; then - go install github.com/hyperledger/firefly-cli/ff@v0.0.36 + go install github.com/hyperledger/firefly-cli/ff@v0.0.37 checkOk $? fi