Skip to content

Commit d8ac2b8

Browse files
committed
add electra tests & start from electra genesis
1 parent 475ce0d commit d8ac2b8

File tree

9 files changed

+48
-11
lines changed

9 files changed

+48
-11
lines changed

.github/workflows/_shared-prepare-docker-cache.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ jobs:
3939
- name: Cache Docker images.
4040
id: cache
4141
if: ${{ steps.check_cache.outputs.exists == 'false' }}
42-
uses: ScribeMD/docker-cache@fb28c93772363301b8d0a6072ce850224b73f74e # 0.5.0
42+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # 4.2.3
4343
with:
44+
path: ./docker-cache
4445
key: kurtosis-docker-${{ runner.os }}-${{ steps.kurtosis_version.outputs.kurtosis_version }}
4546

4647
- name: "Generate dummy kurtosis config"
@@ -65,3 +66,12 @@ jobs:
6566
await_assertoor_tests: "false"
6667
enclave_dump: "false"
6768

69+
- name: "Cache docker images"
70+
if: ${{ steps.cache.outputs.cache-hit == 'false' }}
71+
run: |
72+
if [ ! -d ./docker-cache ]; then
73+
mkdir -p ./docker-cache
74+
fi
75+
76+
docker_images=$(docker image list --format '{{ if ne .Repository "<none>" }}{{ .Repository }}{{ if ne .Tag "<none>" }}:{{ .Tag }}{{ end }}{{ else }}{{ .ID }}{{ end }}' | tr '\n' ' ')
77+
docker save --output ./docker-cache/docker-images.tar $docker_images

.github/workflows/_shared-run-test.yaml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,23 @@ jobs:
7878
steps:
7979
- name: Checkout Repository
8080
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
81+
8182
- name: Cache Docker images.
82-
uses: ScribeMD/docker-cache@fb28c93772363301b8d0a6072ce850224b73f74e # 0.5.0
83+
if: ${{ inputs.backend == 'docker' }}
84+
id: cache
85+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # 4.2.3
8386
with:
87+
path: ./docker-cache
8488
key: kurtosis-docker-${{ runner.os }}-${{ inputs.kurtosis_version }}
85-
read-only: true
89+
90+
- name: "Restore docker cache"
91+
if: ${{ inputs.backend == 'docker' && steps.cache.outputs.cache-hit == 'true' }}
92+
id: restore_cache
93+
shell: bash
94+
run: |
95+
echo "Restoring docker cache..."
96+
docker load -i ./docker-cache/docker-images.tar
97+
8698
- name: "Install shell dependencies"
8799
shell: bash
88100
run: |
@@ -244,12 +256,16 @@ jobs:
244256
)
245257
test_index=0
246258
while read assertoorTest; do
247-
if [[ $assertoorTest != http* ]]; then
248-
assertoorTest="$PUBURL/$assertoorTest"
259+
if [[ $assertoorTest != {* ]]; then
260+
if [[ $assertoorTest != http* ]]; then
261+
assertoorTest="$PUBURL/$assertoorTest"
262+
fi
263+
assertoorTest="\"$assertoorTest\""
249264
fi
250-
kurtosis_cfg="$(echo "$kurtosis_cfg" | yq ".assertoor_params.tests[$test_index]=\"$assertoorTest\"")"
265+
266+
kurtosis_cfg="$(echo "$kurtosis_cfg" | yq ".assertoor_params.tests[$test_index]=$assertoorTest")"
251267
test_index=$(expr $test_index + 1)
252-
done <<< $(echo "$tests_json" | jq -r '.[]')
268+
done <<< $(echo "$tests_json" | jq -rc '.[]')
253269
echo "$kurtosis_cfg" > ./temp/test-network.yaml
254270
255271
echo ""

.github/workflows/run-manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
get_tests:
2525
name: "Load Tests"
26-
runs-on: self-hosted-ghr-size-l-x64
26+
runs-on: ubuntu-latest
2727
outputs:
2828
test_configs: ${{ steps.tests.outputs.test_configs }}
2929
has_docker_tests: ${{ steps.tests.outputs.has_docker_tests }}

.github/workflows/run-scheduled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212
jobs:
1313
get_tests:
1414
name: "Load Tests"
15-
runs-on: self-hosted-ghr-size-l-x64
15+
runs-on: ubuntu-latest
1616
outputs:
1717
test_configs: ${{ steps.tests.outputs.test_configs }}
1818
has_docker_tests: ${{ steps.tests.outputs.has_docker_tests }}

kurtosis-config/default.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ network_params:
1111
shard_committee_period: 1
1212
num_validator_keys_per_node: 250
1313
churn_limit_quotient: 16
14+
electra_fork_epoch: 1
1415
additional_services:
1516
- assertoor
1617
snooper_enabled: true

kurtosis-config/default_with_mev.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ network_params:
1010
shard_committee_period: 1
1111
num_validator_keys_per_node: 250
1212
churn_limit_quotient: 16
13+
electra_fork_epoch: 1
1314
additional_services:
1415
- assertoor
1516
snooper_enabled: true

kurtosis-config/default_with_scoring.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ network_params:
1010
shard_committee_period: 1
1111
num_validator_keys_per_node: 250
1212
churn_limit_quotient: 16
13+
electra_fork_epoch: 1
1314
additional_services:
1415
- assertoor
1516
snooper_enabled: true

kurtosis-config/default_without_snooper.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ network_params:
1010
shard_committee_period: 1
1111
num_validator_keys_per_node: 250
1212
churn_limit_quotient: 16
13+
electra_fork_epoch: 1
1314
additional_services:
1415
- assertoor
1516
snooper_enabled: false

tests.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tests:
88
clients: clients/latest-stable.yaml
99
kurtosis: kurtosis-config/default.yaml
1010
kurtosis_branch: main
11-
worker: ubuntu-latest
11+
worker: [self-hosted-ghr-size-l-x64]
1212
backend: docker
1313
clientPairs:
1414
# CL: [lighthouse,prysm,teku,lodestar,nimbus,grandine]
@@ -33,7 +33,14 @@ tests:
3333
- assertoor-tests/validator-slashing-test.yaml
3434
- assertoor-tests/dencun-opcodes-test.yaml
3535
- assertoor-tests/blob-transactions-test.yaml
36-
36+
- file: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/pectra-dev/eip7002-all.yaml
37+
config:
38+
useExistingValidators: true
39+
validatorStartIndex: 650
40+
- ile: https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/pectra-dev/eip7251-all.yaml
41+
config:
42+
useExistingValidators: true
43+
validatorStartIndex: 680
3744

3845
# Check validator client combinations
3946
- id: "vc-compatibility"

0 commit comments

Comments
 (0)