Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CCIP-4303:Enabling in-memory test in integration-tests workflow #15388

Merged
merged 18 commits into from
Nov 27, 2024
Merged

CCIP-4303:Enabling in-memory test in integration-tests workflow #15388

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6ba8f4a
CCIP-4303:Enabling in-memory test in integration-tests workflow
b-gopalswami Nov 22, 2024
73e4131
Fix naming for integration-tests.yml file to e2e-tests.yml
b-gopalswami Nov 22, 2024
3fa0084
Merge branch 'develop' of github.com:smartcontractkit/chainlink into …
b-gopalswami Nov 25, 2024
56fc8d5
Rename the existing integration-tests to e2e-tests and adding new int…
b-gopalswami Nov 25, 2024
80dffc4
Merge branch 'develop' of github.com:smartcontractkit/chainlink into …
b-gopalswami Nov 26, 2024
3b5cdb5
More cleanup
b-gopalswami Nov 26, 2024
a0c91f3
Update reference
b-gopalswami Nov 26, 2024
1e949dc
Merge branch 'develop' of github.com:smartcontractkit/chainlink into …
b-gopalswami Nov 26, 2024
c5bac75
Update reference
b-gopalswami Nov 26, 2024
6119c67
Update ref
b-gopalswami Nov 26, 2024
e32164a
Merge branch 'develop' of github.com:smartcontractkit/chainlink into …
b-gopalswami Nov 26, 2024
e328d01
Reverting prior integration-tests.yml rename and additional cleanup
b-gopalswami Nov 26, 2024
2fdc549
Update reference
b-gopalswami Nov 26, 2024
cecf908
Merge develop
b-gopalswami Nov 27, 2024
eac9989
Review comments
b-gopalswami Nov 27, 2024
4085ae1
Merge develop
b-gopalswami Nov 27, 2024
f382579
Merge branch 'develop' of github.com:smartcontractkit/chainlink into …
b-gopalswami Nov 27, 2024
0b47add
Rename per review comment
b-gopalswami Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,8 @@ runner-test-matrix:
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0

PG_INSTANCE: true

- id: smoke/ccip/ccip_messaging_test.go:*
path: integration-tests/smoke/ccip/ccip_messaging_test.go
test_env_type: docker
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ jobs:
contents: read
needs: [build-chainlink, changes]
if: github.event_name == 'pull_request' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@27467f0073162e0ca77d33ce26f649b3d0f4c188 #[email protected]
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@2da3cdc159329fb60245799313ac6a8329d04f26 #[email protected]
with:
workflow_name: Run Core E2E Tests For PR
chainlink_version: ${{ inputs.evm-ref || github.sha }}
Expand Down Expand Up @@ -251,7 +251,7 @@ jobs:
contents: read
needs: [build-chainlink, changes]
if: github.event_name == 'merge_group' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@27467f0073162e0ca77d33ce26f649b3d0f4c188 #[email protected]
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@2da3cdc159329fb60245799313ac6a8329d04f26 #[email protected]
with:
workflow_name: Run Core E2E Tests For Merge Queue
chainlink_version: ${{ inputs.evm-ref || github.sha }}
Expand Down Expand Up @@ -296,7 +296,7 @@ jobs:
contents: read
needs: [build-chainlink, changes]
if: github.event_name == 'pull_request' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@2da3cdc159329fb60245799313ac6a8329d04f26 # [email protected]
with:
workflow_name: Run CCIP E2E Tests For PR
chainlink_version: ${{ inputs.evm-ref || github.sha }}
Expand Down Expand Up @@ -337,7 +337,7 @@ jobs:
contents: read
needs: [build-chainlink, changes]
if: github.event_name == 'merge_group' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@2da3cdc159329fb60245799313ac6a8329d04f26 # [email protected]
with:
workflow_name: Run CCIP E2E Tests For Merge Queue
chainlink_version: ${{ inputs.evm-ref || github.sha }}
Expand Down
4 changes: 1 addition & 3 deletions integration-tests/smoke/ccip/ccip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"

"github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
"github.com/smartcontractkit/chainlink/integration-tests/testsetups"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
Expand All @@ -18,8 +17,7 @@ import (

func TestInitialDeployOnLocal(t *testing.T) {
t.Parallel()
lggr := logger.TestLogger(t)
tenv, _, _ := testsetups.NewLocalDevEnvironmentWithDefaultPrice(t, lggr, nil)
tenv := changeset.NewMemoryEnvironmentWithJobsAndContracts(t, logger.TestLogger(t), 2, 4, nil)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not the best test to convert, may be try with fee boosting test. that has the longest running time. This one is just a basic test and should stay in docker. We already have a similar test in memory

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I see the runtime is not improved much( it's > 9min) in CI any idea why?

Copy link
Contributor Author

@b-gopalswami b-gopalswami Nov 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just an example to prove it works. Instead of we convert some test to in-memory, we will eventually add in-memory tests like the one @asoliman92 wants to add for ccipreader.

The other test still runs for 350+ secs. This one previously ran for ~320 secs and now it is ~85 secs. So, clubbing in-memory and docker test might not be helpful. We should have in-memory tests as separate matrix.

e := tenv.Env
state, err := changeset.LoadOnchainState(e)
require.NoError(t, err)
Expand Down
Loading