Skip to content

Commit 259e4f3

Browse files
authored
Merge branch 'main' into TT-1830
2 parents df2b819 + d8d5cee commit 259e4f3

Some content is hidden

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

82 files changed

+519
-1340
lines changed

.github/workflows/framework-golden-tests.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,23 @@ jobs:
2222
config: smoke.toml
2323
count: 1
2424
timeout: 10m
25-
- name: TestLoad
26-
config: load.toml
25+
- name: TestUpgrade
26+
config: upgrade.toml
2727
count: 1
2828
timeout: 10m
29-
- name: TestChaos
30-
config: chaos.toml
29+
- name: TestPerformanceBaseline
30+
config: performance_baseline.toml
3131
count: 1
3232
timeout: 10m
33-
- name: TestUpgradeAll
34-
config: upgrade_all.toml
33+
- name: TestChaos
34+
config: chaos.toml
3535
count: 1
3636
timeout: 10m
37-
- name: TestUpgradeSome
38-
config: upgrade_some.toml
37+
- name: TestScalability
38+
config: scalability.toml
3939
count: 1
4040
timeout: 10m
41+
name: ${{ matrix.test.name }}
4142
steps:
4243
- name: Checkout repo
4344
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

.github/workflows/modgraph.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Module graph
2+
on:
3+
pull_request:
4+
jobs:
5+
modgraph:
6+
runs-on: ubuntu-latest
7+
name: modgraph
8+
steps:
9+
- name: Checkout the Repo
10+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
11+
- name: Setup Go
12+
uses: actions/setup-go@v5
13+
- run: make modgraph
14+
- name: Ensure clean modgraph
15+
run: git diff --minimal --exit-code

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ suite/remote_runner_config.yaml
4646
*.csv
4747

4848
# docs
49-
docs/_site/
50-
docs/.sass-cache/
51-
docs/Gemfile.lock
49+
book/docs/
5250

5351
dist/
5452

@@ -78,4 +76,4 @@ __debug*
7876
.tool-versions
7977

8078
import_keys_test.go
81-
tag.py
79+
tag.py

.nancy-ignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ CVE-2023-48795 # Improper Validation of Integrity Check Value x/crypto, which is
1111
CVE-2024-24786 # CWE-835 Loop with Unreachable Exit Condition ('Infinite Loop') in indirect dependency
1212
CVE-2024-32972 # CWE-400: Uncontrolled Resource Consumption ('Resource Exhaustion') [still not fixed, not even in v1.13.8]
1313
CVE-2023-42319 # CWE-noinfo: lol... go-ethereum v1.13.8 again
14+
CVE-2024-10086 # Improper Neutralization of Input During Web Page Generation ('Cross-site Scripting')
15+
CVE-2024-51744 # CWE-755: Improper Handling of Exceptional Conditions

CONTRIBUTING.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.PHONY: modgraph
2+
modgraph:
3+
go install github.com/jmank88/[email protected]
4+
go install github.com/jmank88/[email protected]
5+
./modgraph > go.md

book/README.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
## MDBook
2-
Install [mdbook](https://github.com/rust-lang/mdBook)
3-
```
1+
# Chainlink Testing Framework Docs
2+
3+
We use [mdBook](https://github.com/rust-lang/mdBook) for our docs. They can be found [here](https://smartcontractkit.github.io/chainlink-testing-framework/).
4+
5+
## Development
6+
7+
First [install Rust](https://doc.rust-lang.org/cargo/getting-started/installation.html), then [mdbook](https://github.com/rust-lang/mdBook).
8+
9+
```sh
10+
# Install mdBook
411
cargo install mdbook && \
512
cargo install mdbook-alerts && \
613
cargo install mdbook-cmdrun
7-
```
8-
9-
Run it locally
10-
```
14+
# Run the mdBook
1115
make run
1216
```
13-
Open your browser [here](http://localhost:9999/)
1417

15-
GitHub hosted [version](https://smartcontractkit.github.io/chainlink-testing-framework/overview.html)
18+
Visit [localhost:9999](http://localhost:9999) to see your local version.

book/src/SUMMARY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
- [Configuration](./framework/configuration.md)
1616
- [Test Configuration](./framework/test_configuration_overrides.md)
1717
- [Components Persistence](framework/components/state.md)
18+
- [Components Cleanup](framework/components/cleanup.md)
1819
- [Components Caching](framework/components/caching.md)
1920
- [External Environment](framework/components/external.md)
2021
- [Secrets]()
21-
- [Docker](framework/docker.md)
2222
- [Observability Stack](framework/observability/observability_stack.md)
2323
- [Metrics](framework/observability/metrics.md)
2424
- [Logs](framework/observability/logs.md)
@@ -39,7 +39,7 @@
3939
- [Chainlink]()
4040
- [RPC]()
4141
- [Loki]()
42-
- [Testing](framework/testing.md)
42+
- [Testing Maturity Model](framework/testing.md)
4343
- [Smoke]()
4444
- [Performance]()
4545
- [Chaos]()
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Components Cleanup
2+
3+
Managing state is challenging, especially in end-to-end testing, we use [ryuk](https://golang.testcontainers.org/features/garbage_collector/#ryuk) and following simple rules:
4+
- If `TESTCONTAINERS_RYUK_DISABLED=true`, no cleanup occurs — containers, volumes, and networks remain on your machine.
5+
6+
Feel free to use `ctf d rm` to remove containers when you are ready.
7+
- If `TESTCONTAINERS_RYUK_DISABLED` is unset, the test environment will be automatically cleaned up a few seconds after the test completes.
8+
9+
10+
Keep in mind that all components are mapped to [static ports](state.md), so without cleanup, only one environment can run at a time.
11+
12+
This design choice simplifies debugging.
13+
14+
A simplified command is available to prune unused volumes, containers, and build caches. Use it when you’re running low on space on your machine.
15+
```
16+
ctf d c
17+
```
18+
19+
<div class="warning">
20+
21+
The framework manages cleanup for both on-chain and off-chain Docker components. However, if your test involves actions like configuring Chainlink jobs, it's best practice to make these actions idempotent, so they can be applied reliably in any environment.
22+
23+
</div>

book/src/framework/docker.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)