Skip to content

Commit ae228c4

Browse files
DeshErBojhaagjermundgarabawomensrights
authored
e2e: Port tests for packet forward middleware module (#8292)
--------- Co-authored-by: Gjermund Garaba <gjermund@garaba.net> Co-authored-by: Susannah Evans <65018876+womensrights@users.noreply.github.com>
1 parent 7b7a159 commit ae228c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1491
-465
lines changed

‎.github/workflows/e2e-fork.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
env:
3939
CHAIN_A_TAG: latest
4040
CHAIN_B_TAG: latest
41+
CHAIN_C_TAG: latest
42+
CHAIN_D_TAG: latest
4143
CHAIN_IMAGE: ibc-go-simd
4244
FORK: "true"
4345
# run this job on forks and copies of ibc-go, for example: a public fork or a private copy of ibc-go.

‎.github/workflows/e2e-manual-simd.yaml‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ on:
1616
- TestInterchainAccountsGroupsTestSuite
1717
- TestInterchainAccountsGovTestSuite
1818
- TestAuthzTransferTestSuite
19+
- TestForwardTransferSuite
1920
chain-image:
20-
description: 'The image to use for chain A'
21+
description: 'The image to use for chains'
2122
required: true
2223
type: string
2324
default: "ghcr.io/cosmos/ibc-go-simd"
@@ -49,6 +50,34 @@ on:
4950
description: 'Specify an arbitrary tag for chain B'
5051
required: false
5152
type: string
53+
chain-c-tag:
54+
description: 'The tag to use for chain C'
55+
required: true
56+
type: choice
57+
default: main
58+
options:
59+
- main
60+
- v10.0.0
61+
- v8.7.0
62+
- v7.10.0
63+
chain-c-tag-override:
64+
description: 'Specify an arbitrary tag for chain C'
65+
required: false
66+
type: string
67+
chain-d-tag:
68+
description: 'The tag to use for chain D'
69+
required: true
70+
type: choice
71+
default: main
72+
options:
73+
- main
74+
- v10.0.0
75+
- v8.7.0
76+
- v7.10.0
77+
chain-d-tag-override:
78+
description: 'Specify an arbitrary tag for chain A'
79+
required: false
80+
type: string
5281

5382
jobs:
5483
e2e-manual:
@@ -57,4 +86,6 @@ jobs:
5786
chain-image: "${{ github.event.inputs.chain-image }}"
5887
chain-a-tag: "${{ github.event.inputs.chain-a-tag-override || github.event.inputs.chain-a-tag }}"
5988
chain-b-tag: "${{ github.event.inputs.chain-b-tag-override || github.event.inputs.chain-b-tag }}"
89+
chain-c-tag: "${{ github.event.inputs.chain-c-tag-override || github.event.inputs.chain-c-tag }}"
90+
chain-d-tag: "${{ github.event.inputs.chain-d-tag-override || github.event.inputs.chain-d-tag }}"
6091
test-entry-point: "${{ github.event.inputs.test-entry-point }}"

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@ on:
3636
description: 'The tag to use for chain B'
3737
required: true
3838
type: string
39+
chain-c-tag:
40+
description: 'The tag to use for chain C'
41+
required: true
42+
type: string
43+
default: main
44+
chain-d-tag:
45+
default: main
46+
description: 'The tag to use for chain D'
47+
required: true
48+
type: string
3949
# upgrade-plan-name is only required during upgrade tests, and is otherwise ignored.
4050
upgrade-plan-name:
4151
default: ''
@@ -78,6 +88,8 @@ jobs:
7888
echo "Chain Image: ${{ inputs.chain-image }}"
7989
echo "Chain A Tag: ${{ inputs.chain-a-tag }}"
8090
echo "Chain B Tag: ${{ inputs.chain-b-tag }}"
91+
echo "Chain C Tag: ${{ inputs.chain-c-tag }}"
92+
echo "Chain D Tag: ${{ inputs.chain-d-tag }}"
8193
echo "Upgrade Plan Name: ${{ inputs.upgrade-plan-name }}"
8294
echo "Test Entry Point: ${{ inputs.test-entry-point }}"
8395
echo "Test: ${{ inputs.test }}"
@@ -205,6 +217,8 @@ jobs:
205217
CHAIN_UPGRADE_PLAN: '${{ inputs.upgrade-plan-name }}'
206218
CHAIN_A_TAG: '${{ inputs.chain-a-tag }}'
207219
CHAIN_B_TAG: '${{ inputs.chain-b-tag }}'
220+
CHAIN_C_TAG: '${{ inputs.chain-c-tag }}'
221+
CHAIN_D_TAG: '${{ inputs.chain-d-tag }}'
208222
E2E_CONFIG_PATH: '${{ inputs.e2e-config-path }}'
209223
strategy:
210224
fail-fast: false
@@ -243,6 +257,8 @@ jobs:
243257
CHAIN_IMAGE: '${{ inputs.chain-image }}'
244258
CHAIN_A_TAG: '${{ inputs.chain-a-tag }}'
245259
CHAIN_B_TAG: '${{ inputs.chain-b-tag }}'
260+
CHAIN_C_TAG: '${{ inputs.chain-c-tag }}'
261+
CHAIN_D_TAG: '${{ inputs.chain-d-tag }}'
246262
E2E_CONFIG_PATH: '${{ inputs.e2e-config-path }}'
247263
strategy:
248264
fail-fast: false
@@ -256,6 +272,7 @@ jobs:
256272
- entrypoint: TestTransferLocalhostTestSuite
257273
- entrypoint: TestConnectionTestSuite
258274
- entrypoint: TestInterchainAccountsGovTestSuite
275+
- entrypoint: TestForwardTransferSuite
259276
steps:
260277
- uses: actions/checkout@v4
261278
with:

‎.github/workflows/e2e-upgrade.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
chain-image: ghcr.io/cosmos/ibc-go-simd
2121
chain-a-tag: v6.1.0
2222
chain-b-tag: v6.1.0
23+
chain-c-tag: v6.1.0
24+
chain-d-tag: v6.1.0
2325
upgrade-plan-name: "v7"
2426
test-entry-point: "TestUpgradeTestSuite"
2527
test: "TestV6ToV7ChainUpgrade"
@@ -31,6 +33,8 @@ jobs:
3133
chain-image: ghcr.io/cosmos/ibc-go-simd
3234
chain-a-tag: v7.0.0
3335
chain-b-tag: v7.0.0
36+
chain-c-tag: v7.0.0
37+
chain-d-tag: v7.0.0
3438
upgrade-plan-name: "v7.1"
3539
test-entry-point: "TestUpgradeTestSuite"
3640
test: "TestV7ToV7_1ChainUpgrade"
@@ -42,6 +46,8 @@ jobs:
4246
chain-image: ghcr.io/cosmos/ibc-go-simd
4347
chain-a-tag: v7.10.0
4448
chain-b-tag: v7.10.0
49+
chain-c-tag: v7.10.0
50+
chain-d-tag: v7.10.0
4551
upgrade-plan-name: "v8"
4652
test-entry-point: "TestUpgradeTestSuite"
4753
test: "TestV7ToV8ChainUpgrade"
@@ -53,6 +59,8 @@ jobs:
5359
chain-image: ghcr.io/cosmos/ibc-go-simd
5460
chain-a-tag: v8.0.0
5561
chain-b-tag: v8.0.0
62+
chain-c-tag: v8.0.0
63+
chain-d-tag: v8.0.0
5664
upgrade-plan-name: "v8.1"
5765
test-entry-point: "TestUpgradeTestSuite"
5866
test: "TestV8ToV8_1ChainUpgrade"
@@ -64,6 +72,8 @@ jobs:
6472
chain-image: ghcr.io/cosmos/ibc-go-simd
6573
chain-a-tag: v8.7.0
6674
chain-b-tag: v8.7.0
75+
chain-c-tag: v8.7.0
76+
chain-d-tag: v8.7.0
6777
upgrade-plan-name: "v10"
6878
test-entry-point: "TestUpgradeTestSuite"
6979
test: "TestV8ToV10ChainUpgrade"
@@ -75,6 +85,8 @@ jobs:
7585
chain-image: ghcr.io/cosmos/ibc-go-simd
7686
chain-a-tag: v8.7.0
7787
chain-b-tag: v8.7.0
88+
chain-c-tag: v8.7.0
89+
chain-d-tag: v8.7.0
7890
upgrade-plan-name: "v10"
7991
test-entry-point: "TestUpgradeTestSuite"
8092
test: "TestV8ToV10ChainUpgrade_Localhost"

‎.github/workflows/e2e.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ jobs:
6464
# with regular tests, both images are the same.
6565
chain-a-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
6666
chain-b-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
67+
chain-c-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
68+
chain-d-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
6769
# on regular PRs we won't run upgrade tests.
6870
# NOTE: we are excluding TestTransferTestSuite as we run this full suite instead of each individual test.
6971
test-exclusions: 'TestUpgradeTestSuite,TestTransferTestSuite,TestAuthzTransferTestSuite,TestTransferTestSuiteSendReceive,TestTransferTestSuiteSendEnabled,TestTransferLocalhostTestSuite,TestConnectionTestSuite,TestInterchainAccountsGovTestSuite'

‎.github/workflows/e2emodule.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fetch-depth: 0
2525
- uses: golangci/golangci-lint-action@v7.0.0
2626
with:
27-
version: v2.0
27+
version: v2.1
2828
only-new-issues: true
2929
args: --timeout 5m
3030
working-directory: e2e/

‎.github/workflows/golangci-feature.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ jobs:
2929
- name: golangci-lint
3030
uses: golangci/golangci-lint-action@v7.0.0
3131
with:
32-
version: v2.0
32+
version: v2.1
3333
only-new-issues: true
3434
args: --timeout 10m

‎.github/workflows/golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
- name: golangci-lint
2626
uses: golangci/golangci-lint-action@v7.0.0
2727
with:
28-
version: v2.0
28+
version: v2.1
2929
only-new-issues: true
3030
args: --timeout 10m

‎.github/workflows/wasm-client.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fetch-depth: 0
2323
- uses: golangci/golangci-lint-action@v7.0.0
2424
with:
25-
version: v2.0
25+
version: v2.1
2626
only-new-issues: true
2727
args: --timeout 10m
2828
working-directory: modules/light-clients/08-wasm

‎e2e/ci-e2e-config.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
# | CHAIN_IMAGE | The image that will be used for the chain | ghcr.io/cosmos/ibc-go-simd |
88
# | CHAIN_A_TAG | The tag used for chain A | N/A (must be set) |
99
# | CHAIN_B_TAG | The tag used for chain B | N/A (must be set) |
10+
# | CHAIN_C_TAG | The tag used for chain C | N/A (must be set) |
11+
# | CHAIN_D_TAG | The tag used for chain D | N/A (must be set) |
1012
# | CHAIN_BINARY | The binary used in the container | simd |
1113
# | RELAYER_TAG | The tag used for the relayer | 1.10.4 |
1214
# | RELAYER_ID | The type of relayer to use (rly/hermes) | hermes |
@@ -28,6 +30,20 @@ chains:
2830
numFullNodes: 1
2931
image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE
3032
binary: simd # override with CHAIN_BINARY
33+
34+
# the entry at index 2 corresponds to CHAIN_C
35+
- chainId: chainC-1
36+
numValidators: 4
37+
numFullNodes: 1
38+
image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE
39+
binary: simd # override with CHAIN_BINARY
40+
41+
# the entry at index 3 corresponds to CHAIN_D
42+
- chainId: chainD-1
43+
numValidators: 4
44+
numFullNodes: 1
45+
image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE
46+
binary: simd # override with CHAIN_BINARY
3147

3248
# activeRelayer must match the id of a relayer specified in the relayers list below.
3349
activeRelayer: hermes # override with RELAYER_ID

0 commit comments

Comments
 (0)