From 155863d86d6b176906c28d862db0a726ac121b66 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Wed, 1 Dec 2021 11:40:54 -0700 Subject: [PATCH] add capella to circleci build --- .circleci/config.yml | 14 ++++++++++++++ configs/mainnet.yaml | 7 ++++++- configs/minimal.yaml | 2 -- presets/mainnet/capella.yaml | 1 + presets/minimal/capella.yaml | 1 + 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 presets/mainnet/capella.yaml create mode 100644 presets/minimal/capella.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index bcce74bd9..beb0f26a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,6 +129,20 @@ jobs: command: make citest fork=merge - store_test_results: path: tests/core/pyspec/test-reports + test-capella: + docker: + - image: circleci/python:3.8 + working_directory: ~/specs-repo + steps: + - restore_cache: + key: v3-specs-repo-{{ .Branch }}-{{ .Revision }} + - restore_pyspec_cached_venv + - run: + name: Run py-tests + command: make citest fork=capella + - store_test_results: + path: tests/core/pyspec/test-reports + table_of_contents: docker: - image: circleci/node:10.16.3 diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml index 395e8d717..6499ddbfb 100644 --- a/configs/mainnet.yaml +++ b/configs/mainnet.yaml @@ -37,11 +37,16 @@ ALTAIR_FORK_EPOCH: 74240 # Oct 27, 2021, 10:56:23am UTC # Merge MERGE_FORK_VERSION: 0x02000000 MERGE_FORK_EPOCH: 18446744073709551615 +# Capella +CAPELLA_FORK_VERSION: 0x03000000 +CAPELLA_FORK_EPOCH: 18446744073709551615 # Sharding -SHARDING_FORK_VERSION: 0x03000000 +SHARDING_FORK_VERSION: 0x04000000 SHARDING_FORK_EPOCH: 18446744073709551615 + + # Time parameters # --------------------------------------------------------------- # 12 seconds diff --git a/configs/minimal.yaml b/configs/minimal.yaml index efa58b57d..74315f48b 100644 --- a/configs/minimal.yaml +++ b/configs/minimal.yaml @@ -44,8 +44,6 @@ SHARDING_FORK_VERSION: 0x04000001 SHARDING_FORK_EPOCH: 18446744073709551615 - - # Time parameters # --------------------------------------------------------------- # [customized] Faster for testing purposes diff --git a/presets/mainnet/capella.yaml b/presets/mainnet/capella.yaml new file mode 100644 index 000000000..7d9da914e --- /dev/null +++ b/presets/mainnet/capella.yaml @@ -0,0 +1 @@ +# Minimal preset - Sharding diff --git a/presets/minimal/capella.yaml b/presets/minimal/capella.yaml new file mode 100644 index 000000000..7d9da914e --- /dev/null +++ b/presets/minimal/capella.yaml @@ -0,0 +1 @@ +# Minimal preset - Sharding