diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index cc1cf633..5ee9f521 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -26,6 +26,23 @@ jobs: - name: Run Starlark run: kurtosis run ${{ github.workspace }} --args-file ${{ matrix.file_name }} --verbosity detailed + # Make sure that `kurtosis run .` without an --args-file works fine (the defaults in input_parser.star are correct) + run_without_args: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Setup Kurtosis + run: | + echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list + sudo apt update + sudo apt install kurtosis-cli + kurtosis analytics disable + + - name: Run Starlark + run: kurtosis run ${{ github.workspace }} --verbosity detailed + lint: runs-on: ubuntu-latest steps: diff --git a/main.star b/main.star index 1ce050e7..a6468eae 100644 --- a/main.star +++ b/main.star @@ -39,7 +39,9 @@ def run(plan, args): # need to do a raw get here in case only optimism_package is provided. # .get will return None if the key is in the config with a None value. - optimism_args = args.get("optimism_package") or input_parser.default_optimism_args() + optimism_args = ( + args.get("optimism_package") or input_parser.default_optimism_params() + ) optimism_args_with_right_defaults = input_parser.input_parser(plan, optimism_args) global_tolerations = optimism_args_with_right_defaults.global_tolerations global_node_selectors = optimism_args_with_right_defaults.global_node_selectors diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 2bd823c5..991fe064 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -656,6 +656,12 @@ def default_op_contract_deployer_params(): def default_ethereum_package_network_params(): return { + "participants": [ + { + "el_type": "geth", + "cl_type": "teku", + } + ], "network_params": { "preset": "minimal", "genesis_delay": 5, @@ -670,7 +676,7 @@ def default_ethereum_package_network_params(): } } ), - } + }, } diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star index 161dbff8..de826290 100644 --- a/src/package_io/sanity_check.star +++ b/src/package_io/sanity_check.star @@ -102,8 +102,28 @@ PARTICIPANT_CATEGORIES = { "cl_max_mem", "el_builder_type", "el_builder_image", + "el_builder_log_level", + "el_builder_extra_env_vars", + "el_builder_extra_labels", + "el_builder_extra_params", + "el_builder_tolerations", + "el_builder_volume_size", + "el_builder_min_cpu", + "el_builder_max_cpu", + "el_builder_min_mem", + "el_builder_max_mem", "cl_builder_type", "cl_builder_image", + "cl_builder_log_level", + "cl_builder_extra_env_vars", + "cl_builder_extra_labels", + "cl_builder_extra_params", + "cl_builder_tolerations", + "cl_builder_volume_size", + "cl_builder_min_cpu", + "cl_builder_max_cpu", + "cl_builder_min_mem", + "cl_builder_max_mem", "node_selectors", "tolerations", "count", @@ -135,6 +155,7 @@ SUBCATEGORY_PARAMS = { ], "mev_params": ["rollup_boost_image", "builder_host", "builder_port"], "da_server_params": [ + "enabled", "image", "cmd", ],