diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml index c62c12ddb78..1b2712426ec 100644 --- a/.github/workflows/e2e-test-workflow-call.yml +++ b/.github/workflows/e2e-test-workflow-call.yml @@ -47,6 +47,11 @@ on: description: 'The upgrade plan name' required: false type: string + relayer-image: + description: 'The image to use for the relayer' + required: false + default: '' # the tests themselves will choose a sensible default when unset. + type: string relayer-type: description: 'The type of relayer to use' required: false @@ -84,6 +89,7 @@ jobs: echo "Chain B Tag: ${{ inputs.chain-b-tag }}" echo "Chain Upgrade Tag: ${{ inputs.chain-upgrade-tag }}" echo "Upgrade Plan Name: ${{ inputs.upgrade-plan-name }}" + echo "Relayer Image:" ${{ inputs.relayer-image }} echo "Relayer Type: ${{ inputs.relayer-type }}" echo "Relayer Tag: ${{ inputs.relayer-tag }}" echo "Test Entry Point: ${{ inputs.test-entry-point }}" @@ -158,6 +164,7 @@ jobs: CHAIN_IMAGE: '${{ inputs.chain-image }}' CHAIN_A_TAG: '${{ inputs.chain-a-tag }}' CHAIN_B_TAG: '${{ inputs.chain-b-tag }}' + RELAYER_IMAGE: '${{ inputs.relayer-image }}' RELAYER_TAG: '${{ inputs.relayer-tag }}' RELAYER_TYPE: '${{ inputs.relayer-type }}' CHAIN_BINARY: '${{ inputs.chain-binary }}' diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 83066790b01..3071898cb73 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -1,14 +1,8 @@ # The Tests / E2E workflow is used to run end-to-end tests on pull requests originating # from the ibc-go repository. The workflow is triggered on a PR opening, when new commits # are pushed to the PR, or when the PR is marked ready for review. -# -# A scheduled job is also set up to run every night. This job is used to run e2e tests -# using the hermes relayer. name: Tests / E2E on: - # This schedule is used solely for hermes and is set to run every night. - schedule: - - cron: '0 0 * * *' workflow_dispatch: pull_request: types: @@ -31,9 +25,6 @@ jobs: runs-on: ubuntu-latest outputs: simd-tag: ${{ steps.get-tag.outputs.simd-tag }} - # Temporarily, see: https://github.com/cosmos/ibc-go/issues/3981 - relayer: ${{ steps.get-relayer.outputs.relayer }} - relayer-tag: ${{ steps.get-relayer.outputs.relayer-tag }} steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 @@ -49,18 +40,6 @@ jobs: echo "Using tag $tag" echo "simd-tag=$tag" >> $GITHUB_OUTPUT fi - # get-relayer will return either hermes or rly depending on whether the workflow was triggered - # by a scheduled run or not. - - id: get-relayer - run: | - if [ "${{ github.event_name }}" == "schedule" ] - then - echo "relayer=rly" >> $GITHUB_OUTPUT - echo "relayer-tag=colin-event-fix" >> $GITHUB_OUTPUT - else - echo "relayer=hermes" >> $GITHUB_OUTPUT - echo "relayer-tag=v1.6.0" >> $GITHUB_OUTPUT - fi # build-e2e ensures that all test code compiles. build-e2e: if: ${{ !github.event.pull_request.draft && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }} @@ -105,6 +84,3 @@ jobs: chain-binary: 'simd' # on regular PRs we won't run interchain account or upgrade tests. test-exclusions: 'TestInterTxTestSuite,TestIncentivizedInterTxTestSuite,TestUpgradeTestSuite' - # Temporarily, see: https://github.com/cosmos/ibc-go/issues/3981 - relayer-type: '${{ needs.determine-image-tag.outputs.relayer }}' - relayer-tag: '${{ needs.determine-image-tag.outputs.relayer-tag }}'