Merge branch 'main' into cian/remove-myself-from-codeowners

.github/workflows/e2e-compatibility-workflow-call.yaml

@@ -60,10 +60,8 @@ jobs:
           # Note: this is significant as the standard behaviour when running e2es on PRs
           # is that there is a set of env vars that are the same for each run. e.g. the same docker image is used
           # for every test. With compatibility tests, each test may be running different combinations of images.
-          CHAIN_IMAGE: 'ghcr.io/cosmos/ibc-go-simd'
           CHAIN_A_TAG: '${{ matrix.chain-a }}'
           CHAIN_B_TAG: '${{ matrix.chain-b }}'
-          CHAIN_BINARY: 'simd'
           RELAYER_ID: '${{ matrix.relayer-type }}'
       - name: Upload Diagnostics
         uses: actions/upload-artifact@v4

.github/workflows/e2e-fork.yml

@@ -59,7 +59,6 @@ jobs:
       CHAIN_A_TAG: latest
       CHAIN_B_TAG: latest
       CHAIN_IMAGE: ibc-go-simd
-      RELAYER_ID: "hermes" # by default use hermes for fork e2es.
       FORK: "true"
     # run this job on forks and copies of ibc-go, for example: a public fork or a private copy of ibc-go.
     if: ${{ github.repository != 'cosmos/ibc-go' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch' }}

.github/workflows/e2e-test-workflow-call.yml

@@ -23,7 +23,7 @@ on:
         default: '' # empty string means don't skip any test.
       chain-image:
         description: 'The image to use for chains'
-        required: true
+        required: false
         type: string
         default: 'ghcr.io/cosmos/ibc-go-simd'
       chain-a-tag:
@@ -36,37 +36,12 @@ on:
         description: 'The tag to use for chain B'
         required: true
         type: string
-      chain-binary:
-        default: 'simd'
-        description: 'The chain binary'
-        required: false
-        type: string
-      chain-upgrade-tag:
-        default: ''
-        description: 'The image tag that the chain will be upgraded to'
-        required: false
-        type: string
       # upgrade-plan-name is only required during upgrade tests, and is otherwise ignored.
       upgrade-plan-name:
         default: ''
         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
-        default: 'hermes'
-        type: string
-      relayer-tag:
-        description: 'The tag to use for the relayer'
-        required: false
-        default: '' # the tests themselves will choose a sensible default when unset.
-        type: string
       build-and-push-docker-image:
         description: 'Flag to specify if the docker image should be built and pushed beforehand'
         required: false
@@ -82,6 +57,11 @@ on:
         required: false
         type: boolean
         default: false
+      e2e-config-path:
+        description: 'Specify relative or absolute path of config file for test'
+        required: false
+        type: string
+        default: 'ci-e2e-config.yaml'
 
 env:
   REGISTRY: ghcr.io
@@ -98,11 +78,7 @@ jobs:
           echo "Chain Image:       ${{ inputs.chain-image }}"
           echo "Chain A Tag:       ${{ inputs.chain-a-tag }}"
           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 }}"
           echo "Test:              ${{ inputs.test }}"
           echo "Github Ref Name:   ${{ github.ref_name }}"
@@ -226,14 +202,10 @@ jobs:
       - docker-build-wasm
     env:
       CHAIN_IMAGE: '${{ inputs.chain-image }}'
+      CHAIN_UPGRADE_PLAN: '${{ inputs.upgrade-plan-name }}'
       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_ID: '${{ inputs.relayer-type }}'
-      CHAIN_BINARY: '${{ inputs.chain-binary }}'
-      CHAIN_UPGRADE_TAG: '${{ inputs.chain-upgrade-tag }}'
-      CHAIN_UPGRADE_PLAN: '${{ inputs.upgrade-plan-name }}'
+      E2E_CONFIG_PATH: '${{ inputs.e2e-config-path }}'
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.build-test-matrix.outputs.matrix) }}
@@ -271,14 +243,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_ID: '${{ inputs.relayer-type }}'
-      CHAIN_BINARY: '${{ inputs.chain-binary }}'
-      CHAIN_UPGRADE_TAG: '${{ inputs.chain-upgrade-tag }}'
-      CHAIN_UPGRADE_PLAN: '${{ inputs.upgrade-plan-name }}'
-      # explicitly set to true so that if a test fails, it doesn't delete the chain and cause other tests to fail.
-      KEEP_CONTAINERS: "true"
+      E2E_CONFIG_PATH: '${{ inputs.e2e-config-path }}'
     strategy:
       fail-fast: false
       matrix:

.github/workflows/e2e-upgrade.yaml

@@ -5,215 +5,110 @@ on:
     branches:
       - main
     paths:
-      # upgrade tests will run on any changes to the upgrade_test.go file.
+      # upgrade tests will run on any changes to the upgrade_test.go file,
+      # and changes to the workflow itself.
       - 'e2e/tests/upgrades/upgrade_test.go'
+      - '.github/workflows/e2e-upgrade.yaml'
   schedule:
     - cron: '0 0 * * *'
 
 
 jobs:
-  upgrade-v7-hermes:
+  upgrade-v7:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
       chain-a-tag: v6.1.0
       chain-b-tag: v6.1.0
-      chain-upgrade-tag: v7.0.0
       upgrade-plan-name: "v7"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV6ToV7ChainUpgrade"
       upload-logs: true
-      relayer-type: hermes
 
-  upgrade-v7_1-hermes:
+  upgrade-v7_1:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
       chain-a-tag: v7.0.0
       chain-b-tag: v7.0.0
-      chain-upgrade-tag: v7.1.0
       upgrade-plan-name: "v7.1"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV7ToV7_1ChainUpgrade"
       upload-logs: true
-      relayer-type: hermes
 
-  upgrade-v8-hermes:
+  upgrade-v8:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
       chain-a-tag: v7.0.0
       chain-b-tag: v7.0.0
-      chain-upgrade-tag: v8.0.0
       upgrade-plan-name: "v8"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV7ToV8ChainUpgrade"
       upload-logs: true
-      relayer-type: hermes
 
-  upgrade-v8_1-hermes:
+  upgrade-v8_1:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
       chain-a-tag: v8.0.0
       chain-b-tag: v8.0.0
-      chain-upgrade-tag: v8.1.0
       upgrade-plan-name: "v8.1"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV8_1ChainUpgrade"
       upload-logs: true
-      relayer-type: hermes
 
-  upgrade-v8_1-channel-upgrades-hermes:
+  upgrade-v8_1-channel-upgrades:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
       chain-a-tag: v8.0.0
       chain-b-tag: v8.0.0
-      chain-upgrade-tag: v8.1.0
       upgrade-plan-name: "v8.1"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV8_1ChainUpgrade_FeeMiddlewareChannelUpgrade"
       upload-logs: true
-      relayer-type: hermes
 
-  upgrade-v7-rly:
-    uses: ./.github/workflows/e2e-test-workflow-call.yml
-    with:
-      chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
-      chain-a-tag: v6.1.0
-      chain-b-tag: v6.1.0
-      chain-upgrade-tag: v7.0.0
-      upgrade-plan-name: "v7"
-      test-entry-point:  "TestUpgradeTestSuite"
-      test: "TestV6ToV7ChainUpgrade"
-      upload-logs: true
-      relayer-type: rly
-      relayer-image: ghcr.io/cosmos/relayer
-      relayer-tag: latest
-
-  upgrade-v7_1-rly:
-    uses: ./.github/workflows/e2e-test-workflow-call.yml
-    with:
-      chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
-      chain-a-tag: v7.0.0
-      chain-b-tag: v7.0.0
-      chain-upgrade-tag: v7.1.0
-      upgrade-plan-name: "v7.1"
-      test-entry-point:  "TestUpgradeTestSuite"
-      test: "TestV7ToV7_1ChainUpgrade"
-      upload-logs: true
-      relayer-type: rly
-      relayer-image: ghcr.io/cosmos/relayer
-      relayer-tag: latest
-
-  upgrade-v8-rly:
-    uses: ./.github/workflows/e2e-test-workflow-call.yml
-    with:
-      chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
-      chain-a-tag: v7.0.0
-      chain-b-tag: v7.0.0
-      chain-upgrade-tag: v8.0.0
-      upgrade-plan-name: "v8"
-      test-entry-point:  "TestUpgradeTestSuite"
-      test: "TestV7ToV8ChainUpgrade"
-      upload-logs: true
-      relayer-type: rly
-      relayer-image: ghcr.io/cosmos/relayer
-      relayer-tag: latest
-
-  upgrade-v8_1-rly:
-    uses: ./.github/workflows/e2e-test-workflow-call.yml
-    with:
-      chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
-      chain-a-tag: v8.0.0
-      chain-b-tag: v8.0.0
-      chain-upgrade-tag: v8.1.0
-      upgrade-plan-name: "v8.1"
-      test-entry-point:  "TestUpgradeTestSuite"
-      test: "TestV8ToV8_1ChainUpgrade"
-      upload-logs: true
-      relayer-type: rly
-      relayer-image: ghcr.io/cosmos/relayer
-      relayer-tag: latest    
-
-  upgrade-ibcwasm-v8-hermes:
+  upgrade-ibcwasm-v8:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-wasm-simd
-      chain-binary: simd
       chain-a-tag: v7.3.0-e2e-upgrade
       chain-b-tag: v7.3.0-e2e-upgrade
-      chain-upgrade-tag: v8.0.0-e2e-upgrade
       upgrade-plan-name: "ibcwasm-v8"
       test-entry-point:  "TestIBCWasmUpgradeTestSuite"
       test: "TestIBCWasmChainUpgrade"
       upload-logs: true
-      relayer-type: hermes
-
-  upgrade-v9-hermes:
-    uses: ./.github/workflows/e2e-test-workflow-call.yml
-    with:
-      chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
-      chain-a-tag: v8.4.0
-      chain-b-tag: v8.4.0
-      chain-upgrade-tag: main # TODO: Update tag to v9.0.0 once it is (pre)released
-      upgrade-plan-name: "v9"
-      test-entry-point:  "TestUpgradeTestSuite"
-      test: "TestV8ToV9ChainUpgrade"
-      upload-logs: true
-      relayer-type: hermes
 
-  upgrade-v9-rly:
+  upgrade-v9:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
       chain-a-tag: v8.4.0
       chain-b-tag: v8.4.0
-      chain-upgrade-tag: main # TODO: Update tag to v9.0.0 once it is (pre)released
       upgrade-plan-name: "v9"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV9ChainUpgrade"
       upload-logs: true
-      relayer-type: rly
-      relayer-image: ghcr.io/cosmos/relayer
-      relayer-tag: latest
 
   upgrade-v9-localhost:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
       chain-a-tag: v8.4.0
       chain-b-tag: v8.4.0
-      chain-upgrade-tag: main # TODO: Update tag to v9.0.0 once it is (pre)released
       upgrade-plan-name: "v9"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV9ChainUpgrade_Localhost"
       upload-logs: true
-      relayer-type: hermes
 
-  upgrade-v9-channel-upgrades-hermes:
+  upgrade-v9-channel-upgrades:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-binary: simd
       chain-a-tag: v8.4.0
-      chain-b-tag: main # TODO: Update tag to v9.0.0 once it is (pre)released
-      chain-upgrade-tag: main # TODO: Update tag to v9.0.0 once it is (pre)released
+      chain-b-tag: v9.0.0
       upgrade-plan-name: "v9"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV9ChainUpgrade_ICS20v2ChannelUpgrade"
       upload-logs: true
-      relayer-type: hermes

.github/workflows/e2e-wasm.yaml

@@ -62,11 +62,9 @@ jobs:
       build-and-push-docker-image-wasm: true
       # if the test fails, we upload logs so that we can download them from the UI.
       upload-logs: true
-      chain-image: ghcr.io/cosmos/ibc-go-wasm-simd
       # with regular tests, both images are the same.
       chain-a-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
       chain-b-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
-      chain-binary: 'simd'
       # only run the grandpa test suite for wasm tests.
       test-entry-point: 'TestGrandpaTestSuite'
       # exclude transfer tests which rely on removed packet event attributes: # https://github.com/cosmos/ibc-go/issues/6243

.github/workflows/e2e.yaml

@@ -61,11 +61,9 @@ jobs:
       build-and-push-docker-image: true
       # if the test fails, we upload logs so that we can download them from the UI.
       upload-logs: true
-      chain-image: ghcr.io/cosmos/ibc-go-simd
       # with regular tests, both images are the same.
       chain-a-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
       chain-b-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
-      chain-binary: 'simd'
       # on regular PRs we won't run upgrade tests.
       # NOTE: we are exluding TestTransferTestSuite as we run this full suite instead of each individual test.
       test-exclusions: 'TestUpgradeTestSuite,TestGrandpaTestSuite,TestIBCWasmUpgradeTestSuite,TestTransferTestSuite,TestAuthzTransferTestSuite,TestTransferTestSuiteSendReceive,TestTransferTestSuiteSendEnabled,TestTransferLocalhostTestSuite,TestConnectionTestSuite,TestInterchainAccountsGovTestSuite,TestIncentivizedTransferTestSuite,TestTransferForwardingTestSuite'