From 0712012cf42711a9fd3dbd88418e5bf48aee67c5 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 20 Apr 2023 13:58:20 -0600 Subject: [PATCH 01/43] Start docker inside the executor Former-commit-id: 2948691fc712898c4ad04bbf11296f8ecbbd5b0b --- .gitea/workflows/fixturenet-eth-test.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index 6b764664..52ef7f54 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -4,6 +4,11 @@ on: push: branches: 'ci-test' +# Needed until we can incorporate docker startup into the executor container +env: + DOCKER_HOST: unix:///var/run/dind.sock + + jobs: test: name: "Run an Ethereum fixturenet test" @@ -23,5 +28,9 @@ jobs: run: ./scripts/create_build_tag_file.sh - name: "Build local shiv package" run: ./scripts/build_shiv_package.sh + - name: Start dockerd # Also needed until we can incorporate into the executor + run: | + dockerd -H $DOCKER_HOST --userland-proxy=false & + sleep 5 - name: "Run fixturenet-eth tests" run: ./tests/fixturenet-eth/run-test.sh -- 2.45.2 From 2cbb6e1f1de12f7eab1c00f3da10fa43ecbf339d Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 20 Apr 2023 15:00:20 -0600 Subject: [PATCH 02/43] Add debug output Former-commit-id: 27d23144e4003fa131a7fc95b7f527848b6181ad --- tests/fixturenet-eth/run-test.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index 3fd4cd59..e187e22f 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -14,8 +14,12 @@ echo "Test version command" reported_version_string=$( $TEST_TARGET_SO version ) echo "Version reported is: ${reported_version_string}" echo "Cloning repositories into: $CERC_REPO_BASE_DIR" -$TEST_TARGET_SO --stack fixturenet-eth setup-repositories +$TEST_TARGET_SO --stack fixturenet-eth setup-repositories +echo "Building containers" $TEST_TARGET_SO --stack fixturenet-eth build-containers +echo "Images in registry:" +docker image ls +echo "Deploying the cluster" $TEST_TARGET_SO --stack fixturenet-eth deploy up # Verify that the fixturenet is up and running $TEST_TARGET_SO --stack fixturenet-eth deploy ps -- 2.45.2 From 5524e9543447ab1d05ad6bb0f5aaba40b894a3ef Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 20 Apr 2023 18:24:45 -0600 Subject: [PATCH 03/43] Force CI to run Former-commit-id: 99ecc01e52eda6bf162679bc0dda79c0438b14cb --- .gitea/workflows/fixturenet-eth-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index 52ef7f54..e767797e 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -34,3 +34,4 @@ jobs: sleep 5 - name: "Run fixturenet-eth tests" run: ./tests/fixturenet-eth/run-test.sh + -- 2.45.2 From 3e949b403fd7a0dcd1e3fb0ab5720061e9ab9c51 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 20 Apr 2023 19:06:20 -0600 Subject: [PATCH 04/43] Force CI again Former-commit-id: fa822a71297ad39d5f8301321e7230f55bb0cb27 --- .gitea/workflows/fixturenet-eth-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index e767797e..21068f8b 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -35,3 +35,4 @@ jobs: - name: "Run fixturenet-eth tests" run: ./tests/fixturenet-eth/run-test.sh + -- 2.45.2 From 595fbe4ecac4f7d1e40cfe06c2a453b7a1111864 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 20 Apr 2023 20:17:19 -0600 Subject: [PATCH 05/43] Force CI again Former-commit-id: 401ab334f00273307f64397f06f2b295c1151085 --- .gitea/workflows/fixturenet-eth-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index 21068f8b..9c519360 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -36,3 +36,4 @@ jobs: run: ./tests/fixturenet-eth/run-test.sh + -- 2.45.2 From 0563764ca40f5ab534ac6e2b404416bbd6962bcc Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 2 May 2023 14:22:40 -0600 Subject: [PATCH 06/43] Trigger CI Former-commit-id: bb1d81a906000d5acf22269eaca53c6ab32c5605 --- .gitea/workflows/fixturenet-eth-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index 9c519360..21068f8b 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -36,4 +36,3 @@ jobs: run: ./tests/fixturenet-eth/run-test.sh - -- 2.45.2 From 7ed2448f03b4b292fa8c7c566e042a66fa02514f Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 18 May 2023 13:57:35 -0600 Subject: [PATCH 07/43] Merge current main Former-commit-id: d82ba6ed5035203d1ce3846744309210caadda62 --- .gitea/workflows/fixturenet-eth-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index 21068f8b..e767797e 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -35,4 +35,3 @@ jobs: - name: "Run fixturenet-eth tests" run: ./tests/fixturenet-eth/run-test.sh - -- 2.45.2 From eab5a6ccf133c071521bf136833dcd65d9c3d929 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 24 May 2023 21:49:35 -0600 Subject: [PATCH 08/43] Trigger CI --- .gitea/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index beaf71d1..1fafafa2 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -37,3 +37,4 @@ jobs: sleep 5 - name: "Run smoke tests" run: ./tests/smoke-test/run-smoke-test.sh + -- 2.45.2 From 8c3a8eb33df9da62ceb04b536a5ad817f4ebd1a1 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 25 May 2023 16:56:59 -0600 Subject: [PATCH 09/43] Add fixturenet-plugeth test --- .../workflows/fixturenet-eth-plugeth-test.yml | 36 +++++++++++++++ tests/fixturenet-eth-plugeth/run-test.sh | 44 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 .gitea/workflows/fixturenet-eth-plugeth-test.yml create mode 100755 tests/fixturenet-eth-plugeth/run-test.sh diff --git a/.gitea/workflows/fixturenet-eth-plugeth-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-test.yml new file mode 100644 index 00000000..ced0823f --- /dev/null +++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml @@ -0,0 +1,36 @@ +name: Fixturenet-Eth-Plugeth-Test + +on: + push: + branches: 'ci-test' + +# Needed until we can incorporate docker startup into the executor container +env: + DOCKER_HOST: unix:///var/run/dind.sock + + +jobs: + test: + name: "Run an Ethereum plugeth fixturenet test" + runs-on: ubuntu-latest + steps: + - name: "Clone project repository" + uses: actions/checkout@v3 + - name: "Install Python" + uses: cerc-io/setup-python@v4 + with: + python-version: '3.8' + - name: "Print Python version" + run: python3 --version + - name: "Install shiv" + run: pip install shiv + - name: "Generate build version file" + run: ./scripts/create_build_tag_file.sh + - name: "Build local shiv package" + run: ./scripts/build_shiv_package.sh + - name: Start dockerd # Also needed until we can incorporate into the executor + run: | + dockerd -H $DOCKER_HOST --userland-proxy=false & + sleep 5 + - name: "Run fixturenet-eth tests" + run: ./tests/fixturenet-eth-plugeth/run-test.sh diff --git a/tests/fixturenet-eth-plugeth/run-test.sh b/tests/fixturenet-eth-plugeth/run-test.sh new file mode 100755 index 00000000..1a961b56 --- /dev/null +++ b/tests/fixturenet-eth-plugeth/run-test.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +set -e +if [ -n "$CERC_SCRIPT_DEBUG" ]; then + set -x +fi +set -e +echo "Running stack-orchestrator Ethereum plugeth fixturenet test" +# Bit of a hack, test the most recent package +TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 ) +CERC_STACK_NAME=fixturenet-plugeth-tx +# Set a new unique repo dir +export CERC_REPO_BASE_DIR=$(mktemp -d stack-orchestrator-fixturenet-eth-test.XXXXXXXXXX) +echo "Testing this package: $TEST_TARGET_SO" +echo "Test version command" +reported_version_string=$( $TEST_TARGET_SO version ) +echo "Version reported is: ${reported_version_string}" +echo "Cloning repositories into: $CERC_REPO_BASE_DIR" +$TEST_TARGET_SO --stack $CERC_STACK_NAME setup-repositories +echo "Building containers" +$TEST_TARGET_SO --stack $CERC_STACK_NAME build-containers +echo "Images in registry:" +docker image ls +echo "Deploying the cluster" +$TEST_TARGET_SO --stack $CERC_STACK_NAME deploy up +# Verify that the fixturenet is up and running +$TEST_TARGET_SO --stack $CERC_STACK_NAME deploy ps +$TEST_TARGET_SO --stack $CERC_STACK_NAME deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh +initial_block_number=$($TEST_TARGET_SO --stack fixturenet-plugeth-tx deploy exec foundry "cast block-number") +# Check that the block number increases some time later +sleep 12 +subsequent_block_number=$($TEST_TARGET_SO --stack $CERC_STACK_NAME deploy exec foundry "cast block-number") +block_number_difference=$((subsequent_block_number - initial_block_number)) +# Block height difference should be between 1 and some small number +if [[ $block_number_difference -gt 1 && $block_number_difference -lt 10 ]]; then + echo "Test passed" + test_result=0 +else + echo "Test failed: block numbers were ${initial_block_number} and ${subsequent_block_number}" + test_result=1 +fi +$TEST_TARGET_SO --stack $CERC_STACK_NAME deploy down +echo "Removing cloned repositories" +rm -rf $CERC_REPO_BASE_DIR +exit $test_result -- 2.45.2 From 500e60c48092cb9c9136c7b8597791d0f9f98037 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 30 May 2023 08:49:36 -0600 Subject: [PATCH 10/43] Trigger CI --- .gitea/workflows/fixturenet-eth-plugeth-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/fixturenet-eth-plugeth-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-test.yml index ced0823f..7d5e0795 100644 --- a/.gitea/workflows/fixturenet-eth-plugeth-test.yml +++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml @@ -34,3 +34,4 @@ jobs: sleep 5 - name: "Run fixturenet-eth tests" run: ./tests/fixturenet-eth-plugeth/run-test.sh + -- 2.45.2 From b594d15e91a97df50f7b461219b1d8c92279843e Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 30 May 2023 12:23:48 -0600 Subject: [PATCH 11/43] Trigger CI --- .gitea/workflows/fixturenet-eth-plugeth-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/fixturenet-eth-plugeth-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-test.yml index 7d5e0795..ced0823f 100644 --- a/.gitea/workflows/fixturenet-eth-plugeth-test.yml +++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml @@ -34,4 +34,3 @@ jobs: sleep 5 - name: "Run fixturenet-eth tests" run: ./tests/fixturenet-eth-plugeth/run-test.sh - -- 2.45.2 From 00d34944a2aea63f6547f3f165f5d88124cadbee Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 30 May 2023 23:20:26 -0600 Subject: [PATCH 12/43] Add foundry to fixturenet-plugeth-tx --- app/data/stacks/fixturenet-plugeth-tx/stack.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/data/stacks/fixturenet-plugeth-tx/stack.yml b/app/data/stacks/fixturenet-plugeth-tx/stack.yml index c076d852..49dea4c5 100644 --- a/app/data/stacks/fixturenet-plugeth-tx/stack.yml +++ b/app/data/stacks/fixturenet-plugeth-tx/stack.yml @@ -3,11 +3,14 @@ name: fixturenet-plugeth-tx decription: "plugeth Ethereum Fixturenet w/ tx-spammer" repos: - github.com/cerc-io/tx-spammer + - dboreham/foundry containers: - cerc/lighthouse - cerc/fixturenet-plugeth-plugeth - cerc/fixturenet-plugeth-lighthouse - cerc/tx-spammer + - cerc/foundry pods: - fixturenet-plugeth + - foundry - tx-spammer -- 2.45.2 From 685e11ed6f394b065325fb86293db3389d01093a Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 14:27:07 -0600 Subject: [PATCH 13/43] Build lcli locally --- .../cerc-fixturenet-eth-lighthouse/Dockerfile | 2 +- .../cerc-fixturenet-plugeth-lighthouse/Dockerfile | 2 +- app/data/container-build/cerc-lighthouse-cli/build.sh | 7 +++++++ app/data/stacks/fixturenet-eth-loaded/stack.yml | 1 + app/data/stacks/fixturenet-eth-tx/stack.yml | 1 + app/data/stacks/fixturenet-plugeth-tx/stack.yml | 1 + 6 files changed, 12 insertions(+), 2 deletions(-) create mode 100755 app/data/container-build/cerc-lighthouse-cli/build.sh diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile b/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile index 958d2b39..87f9bb60 100644 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile @@ -1,4 +1,4 @@ -FROM sigp/lcli:v4.1.0 AS lcli +FROM cerc/lighthouse-cli:local AS lcli FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen FROM cerc/fixturenet-eth-geth:local AS fnetgeth diff --git a/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile index 8701fe2d..ba92294b 100644 --- a/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile +++ b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile @@ -1,4 +1,4 @@ -FROM sigp/lcli:v4.1.0 AS lcli +FROM cerc/lighthouse-cli:local AS lcli FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen FROM cerc/fixturenet-plugeth-plugeth:local AS fnetgeth diff --git a/app/data/container-build/cerc-lighthouse-cli/build.sh b/app/data/container-build/cerc-lighthouse-cli/build.sh new file mode 100755 index 00000000..a1d347cf --- /dev/null +++ b/app/data/container-build/cerc-lighthouse-cli/build.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Build cerc/lighthouse-cli + +source ${CERC_CONTAINER_BASE_DIR}/build-base.sh + +project_dir=${CERC_REPO_BASE_DIR}/lighthouse +docker build -t cerc/lighthouse-cli:local -f ${project_dir}/lcli/Dockerfile ${build_command_args} ${project_dir} diff --git a/app/data/stacks/fixturenet-eth-loaded/stack.yml b/app/data/stacks/fixturenet-eth-loaded/stack.yml index 676e95e2..860e3aaf 100644 --- a/app/data/stacks/fixturenet-eth-loaded/stack.yml +++ b/app/data/stacks/fixturenet-eth-loaded/stack.yml @@ -9,6 +9,7 @@ repos: containers: - cerc/go-ethereum - cerc/lighthouse + - cerc/lighthouse-cli - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/ipld-eth-server diff --git a/app/data/stacks/fixturenet-eth-tx/stack.yml b/app/data/stacks/fixturenet-eth-tx/stack.yml index 0281b262..185f813a 100644 --- a/app/data/stacks/fixturenet-eth-tx/stack.yml +++ b/app/data/stacks/fixturenet-eth-tx/stack.yml @@ -8,6 +8,7 @@ repos: containers: - cerc/go-ethereum - cerc/lighthouse + - cerc/lighthouse-cli - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/tx-spammer diff --git a/app/data/stacks/fixturenet-plugeth-tx/stack.yml b/app/data/stacks/fixturenet-plugeth-tx/stack.yml index 49dea4c5..57d2c7ba 100644 --- a/app/data/stacks/fixturenet-plugeth-tx/stack.yml +++ b/app/data/stacks/fixturenet-plugeth-tx/stack.yml @@ -6,6 +6,7 @@ repos: - dboreham/foundry containers: - cerc/lighthouse + - cerc/lighthouse-cli - cerc/fixturenet-plugeth-plugeth - cerc/fixturenet-plugeth-lighthouse - cerc/tx-spammer -- 2.45.2 From c120ee20864469b3551f074ae3aa9bd5e7426b45 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 14:29:07 -0600 Subject: [PATCH 14/43] Pull lighthouse repo --- app/data/stacks/fixturenet-eth-loaded/stack.yml | 1 + app/data/stacks/fixturenet-eth-tx/stack.yml | 3 ++- app/data/stacks/fixturenet-plugeth-tx/stack.yml | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/data/stacks/fixturenet-eth-loaded/stack.yml b/app/data/stacks/fixturenet-eth-loaded/stack.yml index 860e3aaf..dd7e05fd 100644 --- a/app/data/stacks/fixturenet-eth-loaded/stack.yml +++ b/app/data/stacks/fixturenet-eth-loaded/stack.yml @@ -6,6 +6,7 @@ repos: - github.com/cerc-io/tx-spammer - github.com/cerc-io/ipld-eth-server - github.com/cerc-io/ipld-eth-db + - github.com/cerc-io/lighthouse containers: - cerc/go-ethereum - cerc/lighthouse diff --git a/app/data/stacks/fixturenet-eth-tx/stack.yml b/app/data/stacks/fixturenet-eth-tx/stack.yml index 185f813a..35e43575 100644 --- a/app/data/stacks/fixturenet-eth-tx/stack.yml +++ b/app/data/stacks/fixturenet-eth-tx/stack.yml @@ -4,7 +4,8 @@ decription: "Ethereum Fixturenet w/ tx-spammer" repos: - github.com/cerc-io/go-ethereum - github.com/cerc-io/tx-spammer - - dboreham/foundry + - github.com/dboreham/foundry + - github.com/cerc-io/lighthouse containers: - cerc/go-ethereum - cerc/lighthouse diff --git a/app/data/stacks/fixturenet-plugeth-tx/stack.yml b/app/data/stacks/fixturenet-plugeth-tx/stack.yml index 57d2c7ba..e6d8c615 100644 --- a/app/data/stacks/fixturenet-plugeth-tx/stack.yml +++ b/app/data/stacks/fixturenet-plugeth-tx/stack.yml @@ -3,7 +3,8 @@ name: fixturenet-plugeth-tx decription: "plugeth Ethereum Fixturenet w/ tx-spammer" repos: - github.com/cerc-io/tx-spammer - - dboreham/foundry + - github.com/dboreham/foundry + - github.com/cerc-io/lighthouse containers: - cerc/lighthouse - cerc/lighthouse-cli -- 2.45.2 From 223aacb16ff1b66e5bc7d8616461c2086546dd9a Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 14:30:01 -0600 Subject: [PATCH 15/43] Enable portable lcli build --- app/data/container-build/cerc-lighthouse-cli/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/data/container-build/cerc-lighthouse-cli/build.sh b/app/data/container-build/cerc-lighthouse-cli/build.sh index a1d347cf..75719ef4 100755 --- a/app/data/container-build/cerc-lighthouse-cli/build.sh +++ b/app/data/container-build/cerc-lighthouse-cli/build.sh @@ -4,4 +4,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh project_dir=${CERC_REPO_BASE_DIR}/lighthouse -docker build -t cerc/lighthouse-cli:local -f ${project_dir}/lcli/Dockerfile ${build_command_args} ${project_dir} +docker build -t cerc/lighthouse-cli:local --build-arg PORTABLE=true -f ${project_dir}/lcli/Dockerfile ${build_command_args} ${project_dir} -- 2.45.2 From 47164cb5f52209e29c87c7d94f775e4a302e796e Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 16:12:16 -0600 Subject: [PATCH 16/43] Test updated lcli command --- .../cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh index ab3ad2af..18b0ecf8 100755 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh @@ -31,7 +31,7 @@ lcli \ --genesis-delay $GENESIS_DELAY \ --genesis-fork-version $GENESIS_FORK_VERSION \ --altair-fork-epoch $ALTAIR_FORK_EPOCH \ - --merge-fork-epoch $MERGE_FORK_EPOCH \ + --bellatrix-fork-epoch $MERGE_FORK_EPOCH \ --eth1-id $ETH1_CHAIN_ID \ --eth1-follow-distance 1 \ --seconds-per-slot $SECONDS_PER_SLOT \ -- 2.45.2 From 609128d004bd4766b955e18887e60302f4540c4b Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 16:42:44 -0600 Subject: [PATCH 17/43] Blind fix for lcli error --- .../cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh index 18b0ecf8..64450bb8 100755 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh @@ -27,6 +27,7 @@ lcli \ --deposit-contract-address $ETH1_DEPOSIT_CONTRACT_ADDRESS \ --testnet-dir $TESTNET_DIR \ --min-genesis-active-validator-count $GENESIS_VALIDATOR_COUNT \ + --validator-count $VALIDATOR_COUNT --min-genesis-time $GENESIS_TIME \ --genesis-delay $GENESIS_DELAY \ --genesis-fork-version $GENESIS_FORK_VERSION \ -- 2.45.2 From aa4c52c174b118a5570c716a4a0d60647c4ca1dd Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 16:43:38 -0600 Subject: [PATCH 18/43] Fix typo --- .../cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh index 64450bb8..2245fe0e 100755 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh @@ -27,7 +27,7 @@ lcli \ --deposit-contract-address $ETH1_DEPOSIT_CONTRACT_ADDRESS \ --testnet-dir $TESTNET_DIR \ --min-genesis-active-validator-count $GENESIS_VALIDATOR_COUNT \ - --validator-count $VALIDATOR_COUNT + --validator-count $VALIDATOR_COUNT \ --min-genesis-time $GENESIS_TIME \ --genesis-delay $GENESIS_DELAY \ --genesis-fork-version $GENESIS_FORK_VERSION \ -- 2.45.2 From 3748fa38b181a62988092618c5bd17596285313e Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 23:01:43 -0600 Subject: [PATCH 19/43] Update ldcli options --- .../cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh index ab3ad2af..2245fe0e 100755 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh @@ -27,11 +27,12 @@ lcli \ --deposit-contract-address $ETH1_DEPOSIT_CONTRACT_ADDRESS \ --testnet-dir $TESTNET_DIR \ --min-genesis-active-validator-count $GENESIS_VALIDATOR_COUNT \ + --validator-count $VALIDATOR_COUNT \ --min-genesis-time $GENESIS_TIME \ --genesis-delay $GENESIS_DELAY \ --genesis-fork-version $GENESIS_FORK_VERSION \ --altair-fork-epoch $ALTAIR_FORK_EPOCH \ - --merge-fork-epoch $MERGE_FORK_EPOCH \ + --bellatrix-fork-epoch $MERGE_FORK_EPOCH \ --eth1-id $ETH1_CHAIN_ID \ --eth1-follow-distance 1 \ --seconds-per-slot $SECONDS_PER_SLOT \ -- 2.45.2 From fd40aedadda730507a555f5203af1d146bf3ae75 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 4 Jun 2023 23:03:48 -0600 Subject: [PATCH 20/43] Add lcli container to fixturenet-eth stack --- app/data/stacks/fixturenet-eth/stack.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/data/stacks/fixturenet-eth/stack.yml b/app/data/stacks/fixturenet-eth/stack.yml index ccd2526a..ae06e2d2 100644 --- a/app/data/stacks/fixturenet-eth/stack.yml +++ b/app/data/stacks/fixturenet-eth/stack.yml @@ -3,10 +3,12 @@ name: fixturenet-eth decription: "Ethereum Fixturenet" repos: - github.com/cerc-io/go-ethereum + - github.com/cerc-io/lighthouse - github.com/dboreham/foundry containers: - cerc/go-ethereum - cerc/lighthouse + - cerc/lighthouse-cli - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/foundry -- 2.45.2 From 91d3613247bbbad4b3a7974450cdd9c32021ecea Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Mon, 5 Jun 2023 15:45:07 -0500 Subject: [PATCH 21/43] Include --eth1-block-hash --- .../cerc-fixturenet-eth-geth/Dockerfile | 12 ++++++++++++ .../genesis/cl/build_cl.sh | 1 + .../genesis/cl/vars.env | 2 ++ 3 files changed, 15 insertions(+) diff --git a/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile b/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile index 666f9117..dc81eb06 100644 --- a/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile +++ b/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile @@ -22,6 +22,18 @@ COPY run-el.sh /opt/testnet/run.sh RUN cd /opt/testnet && make genesis-el COPY --from=geth /usr/local/bin/geth /usr/local/bin/ + +# Snag the genesis block info. RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey +RUN cp -rp ~/ethdata ~/tmpeth && \ + geth --datadir ~/tmpeth init /opt/testnet/build/el/geth.json && \ + geth --datadir ~/tmpeth --http & \ + sleep 5 && \ + curl -q --location 'localhost:8545' \ + --header 'Content-Type: application/json' \ + --data '{ "jsonrpc": "2.0", "id": 14, "method": "eth_getBlockByNumber", "params": ["0x0", false] }' \ + -o /opt/testnet/build/el/genesis_block.json && \ + killall -9 geth && \ + rm -rf ~/tmpeth ENTRYPOINT ["/opt/testnet/run.sh"] diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh index 2245fe0e..50b3e4e6 100755 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh @@ -34,6 +34,7 @@ lcli \ --altair-fork-epoch $ALTAIR_FORK_EPOCH \ --bellatrix-fork-epoch $MERGE_FORK_EPOCH \ --eth1-id $ETH1_CHAIN_ID \ + --eth1-block-hash $ETH1_BLOCK_HASH \ --eth1-follow-distance 1 \ --seconds-per-slot $SECONDS_PER_SLOT \ --seconds-per-eth1-block $SECONDS_PER_ETH1_BLOCK \ diff --git a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env index b8c27349..f2060a9a 100644 --- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env +++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env @@ -42,7 +42,9 @@ VC_ARGS=${VC_ARGS:-""} EXECUTION_ENDPOINT=${EXECUTION_ENDPOINT:-http://localhost:8551} ETH1_GENESIS_JSON=${ETH1_GENESIS_JSON:-"../build/el/geth.json"} +ETH1_GENESIS_BLOCK_JSON=${ETH1_GENESIS_BLOCK_JSON:-"../build/el/genesis_block.json"} ETH1_CONFIG_YAML=${ETH1_CONFIG_YAML:-"../el/el-config.yaml"} +ETH1_BLOCK_HASH=${ETH1_BLOCK_HASH:-`cat $ETH1_GENESIS_BLOCK_JSON | jq -r '.result.hash' | cut -d'x' -f2`} ETH1_CHAIN_ID=${ETH1_CHAIN_ID:-`cat $ETH1_GENESIS_JSON | jq -r '.config.chainId'`} ETH1_TTD=${ETH1_TTD:-`cat $ETH1_GENESIS_JSON | jq -r '.config.terminalTotalDifficulty'`} -- 2.45.2 From 5d7e7294c94ffa8b0ac2281dcd41c1e984fbc2d8 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 18 Jul 2023 11:33:01 -0600 Subject: [PATCH 22/43] Update fixturenet-eth-test.yml Change to trigger CI in gitea --- .gitea/workflows/fixturenet-eth-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index e767797e..21068f8b 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -35,3 +35,4 @@ jobs: - name: "Run fixturenet-eth tests" run: ./tests/fixturenet-eth/run-test.sh + -- 2.45.2 From a265794bd72d9b8c16073983ebec35faae75a62e Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 18 Jul 2023 11:43:18 -0600 Subject: [PATCH 23/43] Update fixturenet-eth-test.yml Change to trigger CI on Gitea --- .gitea/workflows/fixturenet-eth-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index 21068f8b..e767797e 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -35,4 +35,3 @@ jobs: - name: "Run fixturenet-eth tests" run: ./tests/fixturenet-eth/run-test.sh - -- 2.45.2 From 12e68ff1ec5ec5ac43e0cbcfaebf735c6f20e9d7 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 27 Jul 2023 20:14:12 -0600 Subject: [PATCH 24/43] Use latest stable lighthouse release --- app/data/container-build/cerc-lighthouse/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/data/container-build/cerc-lighthouse/Dockerfile b/app/data/container-build/cerc-lighthouse/Dockerfile index 9391e93d..2cd95ad4 100644 --- a/app/data/container-build/cerc-lighthouse/Dockerfile +++ b/app/data/container-build/cerc-lighthouse/Dockerfile @@ -1,5 +1,5 @@ ARG TAG_SUFFIX="-modern" -FROM sigp/lighthouse:v4.1.0${TAG_SUFFIX} +FROM sigp/lighthouse:v4.3.0${TAG_SUFFIX} RUN apt-get update; apt-get install bash netcat curl less jq -y; -- 2.45.2 From 952ea29ca58793162cbad77e7c781f74ec4267b3 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 16 Aug 2023 13:50:27 -0600 Subject: [PATCH 25/43] Add time stamps to test script --- tests/fixturenet-eth/run-test.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index a7e04030..97e1628b 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -4,25 +4,31 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then set -x fi -echo "Running stack-orchestrator Ethereum fixturenet test" +echo "$(date +"%Y-%m-%d %T"): Running stack-orchestrator Ethereum fixturenet test" # Bit of a hack, test the most recent package TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 ) # Set a new unique repo dir export CERC_REPO_BASE_DIR=$(mktemp -d stack-orchestrator-fixturenet-eth-test.XXXXXXXXXX) -echo "Testing this package: $TEST_TARGET_SO" -echo "Test version command" +echo "$(date +"%Y-%m-%d %T"): Testing this package: $TEST_TARGET_SO" +echo "$(date +"%Y-%m-%d %T"): Test version command" reported_version_string=$( $TEST_TARGET_SO version ) -echo "Version reported is: ${reported_version_string}" -echo "Cloning repositories into: $CERC_REPO_BASE_DIR" -$TEST_TARGET_SO --stack fixturenet-eth setup-repositories +echo "$(date +"%Y-%m-%d %T"): Version reported is: ${reported_version_string}" +echo "$(date +"%Y-%m-%d %T"): Cloning repositories into: $CERC_REPO_BASE_DIR" +$TEST_TARGET_SO --stack fixturenet-eth setup-repositories +echo "$(date +"%Y-%m-%d %T"): Building containers" $TEST_TARGET_SO --stack fixturenet-eth build-containers +echo "$(date +"%Y-%m-%d %T"): Starting stack" $TEST_TARGET_SO --stack fixturenet-eth deploy up +echo "$(date +"%Y-%m-%d %T"): Stack started" # Verify that the fixturenet is up and running $TEST_TARGET_SO --stack fixturenet-eth deploy ps +echo "$(date +"%Y-%m-%d %T"): Getting stack status" $TEST_TARGET_SO --stack fixturenet-eth deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh +echo "$(date +"%Y-%m-%d %T"): Getting initial block number" initial_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") # Check that the block number increases some time later sleep 12 +echo "$(date +"%Y-%m-%d %T"): Getting subsequent block number" subsequent_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") block_number_difference=$((subsequent_block_number - initial_block_number)) # Block height difference should be between 1 and some small number @@ -34,6 +40,6 @@ else test_result=1 fi $TEST_TARGET_SO --stack fixturenet-eth deploy down -echo "Removing cloned repositories" +echo "$(date +"%Y-%m-%d %T"): Removing cloned repositories" rm -rf $CERC_REPO_BASE_DIR exit $test_result -- 2.45.2 From fae2438e97b5bcb24adc437558b9e83c062aa380 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 16 Aug 2023 15:45:19 -0600 Subject: [PATCH 26/43] Comment out stack status step --- tests/fixturenet-eth/run-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index 97e1628b..42991e5a 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -22,8 +22,8 @@ $TEST_TARGET_SO --stack fixturenet-eth deploy up echo "$(date +"%Y-%m-%d %T"): Stack started" # Verify that the fixturenet is up and running $TEST_TARGET_SO --stack fixturenet-eth deploy ps -echo "$(date +"%Y-%m-%d %T"): Getting stack status" -$TEST_TARGET_SO --stack fixturenet-eth deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh +# echo "$(date +"%Y-%m-%d %T"): Getting stack status" +# $TEST_TARGET_SO --stack fixturenet-eth deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh echo "$(date +"%Y-%m-%d %T"): Getting initial block number" initial_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") # Check that the block number increases some time later -- 2.45.2 From 5a31cb50c3f98871dc8c5f2e806bc2ccad2bc3ec Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 16 Aug 2023 20:57:59 -0600 Subject: [PATCH 27/43] Add log output at end of test --- tests/fixturenet-eth/run-test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index 42991e5a..76680f04 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -42,4 +42,5 @@ fi $TEST_TARGET_SO --stack fixturenet-eth deploy down echo "$(date +"%Y-%m-%d %T"): Removing cloned repositories" rm -rf $CERC_REPO_BASE_DIR +echo "$(date +"%Y-%m-%d %T"): Test finished" exit $test_result -- 2.45.2 From 82a839d15fa4629d3df2238c57f469db25a7efd1 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 16 Aug 2023 22:12:45 -0600 Subject: [PATCH 28/43] Try waiting longer for a new block --- tests/fixturenet-eth/run-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index 76680f04..8bdde7a6 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -27,7 +27,7 @@ $TEST_TARGET_SO --stack fixturenet-eth deploy ps echo "$(date +"%Y-%m-%d %T"): Getting initial block number" initial_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") # Check that the block number increases some time later -sleep 12 +sleep 120 echo "$(date +"%Y-%m-%d %T"): Getting subsequent block number" subsequent_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") block_number_difference=$((subsequent_block_number - initial_block_number)) -- 2.45.2 From f62a8ff54f03c6a6de5c89053c444d5d0bcb4903 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 16 Aug 2023 23:41:39 -0600 Subject: [PATCH 29/43] Try waiting even longer --- tests/fixturenet-eth/run-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index 8bdde7a6..323a1712 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -27,7 +27,7 @@ $TEST_TARGET_SO --stack fixturenet-eth deploy ps echo "$(date +"%Y-%m-%d %T"): Getting initial block number" initial_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") # Check that the block number increases some time later -sleep 120 +sleep 240 echo "$(date +"%Y-%m-%d %T"): Getting subsequent block number" subsequent_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") block_number_difference=$((subsequent_block_number - initial_block_number)) -- 2.45.2 From 69d59b109bf825e88137fda95cff5bb7a0694855 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 17 Aug 2023 00:36:36 -0600 Subject: [PATCH 30/43] Add stack logs in case of fail --- tests/fixturenet-eth/run-test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index 323a1712..c3195bcf 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -37,6 +37,8 @@ if [[ $block_number_difference -gt 1 && $block_number_difference -lt 10 ]]; then test_result=0 else echo "Test failed: block numbers were ${initial_block_number} and ${subsequent_block_number}" + echo "Logs from stack:" + $TEST_TARGET_SO --stack fixturenet-eth deploy logs test_result=1 fi $TEST_TARGET_SO --stack fixturenet-eth deploy down -- 2.45.2 From ac02753ffee10a4eaefbb4503952c618ea0d5132 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 17 Aug 2023 02:09:29 -0600 Subject: [PATCH 31/43] Build lighthouse for older CPUs --- app/data/container-build/cerc-lighthouse/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/data/container-build/cerc-lighthouse/build.sh b/app/data/container-build/cerc-lighthouse/build.sh index 2e9cfe3c..cdc95612 100755 --- a/app/data/container-build/cerc-lighthouse/build.sh +++ b/app/data/container-build/cerc-lighthouse/build.sh @@ -6,4 +6,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh # See: https://stackoverflow.com/a/246128/1701505 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -docker build -t cerc/lighthouse:local ${build_command_args} ${SCRIPT_DIR} +docker build -t cerc/lighthouse:local ${build_command_args} --build-arg TAG_SUFFIX="" ${SCRIPT_DIR} -- 2.45.2 From 7fc63758864a6ed65b8618f673acc829a38dfafe Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 17 Aug 2023 03:04:22 -0600 Subject: [PATCH 32/43] Revert long wait --- tests/fixturenet-eth/run-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index c3195bcf..8263ebf6 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -27,7 +27,7 @@ $TEST_TARGET_SO --stack fixturenet-eth deploy ps echo "$(date +"%Y-%m-%d %T"): Getting initial block number" initial_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") # Check that the block number increases some time later -sleep 240 +sleep 24 echo "$(date +"%Y-%m-%d %T"): Getting subsequent block number" subsequent_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") block_number_difference=$((subsequent_block_number - initial_block_number)) -- 2.45.2 From 4e656df7097ff59b94980c39000ebdf0238e9d55 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 17 Aug 2023 07:23:33 -0600 Subject: [PATCH 33/43] Extend the wait --- tests/fixturenet-eth/run-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index 8263ebf6..55e8b247 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -27,7 +27,7 @@ $TEST_TARGET_SO --stack fixturenet-eth deploy ps echo "$(date +"%Y-%m-%d %T"): Getting initial block number" initial_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") # Check that the block number increases some time later -sleep 24 +sleep 120 echo "$(date +"%Y-%m-%d %T"): Getting subsequent block number" subsequent_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") block_number_difference=$((subsequent_block_number - initial_block_number)) -- 2.45.2 From 69b352dcce944108fe7963f9f2ffaf794c5f67d2 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 17 Aug 2023 08:31:21 -0600 Subject: [PATCH 34/43] Make the block window wider --- tests/fixturenet-eth/run-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixturenet-eth/run-test.sh b/tests/fixturenet-eth/run-test.sh index 55e8b247..b5654584 100755 --- a/tests/fixturenet-eth/run-test.sh +++ b/tests/fixturenet-eth/run-test.sh @@ -32,7 +32,7 @@ echo "$(date +"%Y-%m-%d %T"): Getting subsequent block number" subsequent_block_number=$($TEST_TARGET_SO --stack fixturenet-eth deploy exec foundry "cast block-number") block_number_difference=$((subsequent_block_number - initial_block_number)) # Block height difference should be between 1 and some small number -if [[ $block_number_difference -gt 1 && $block_number_difference -lt 10 ]]; then +if [[ $block_number_difference -gt 1 && $block_number_difference -lt 100 ]]; then echo "Test passed" test_result=0 else -- 2.45.2 From 1520f7413d48b56e5b3ec02cfcf7e00d9e346567 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 8 Nov 2023 20:02:21 -0700 Subject: [PATCH 35/43] Debug CI --- .gitea/workflows/test-k8s-deploy.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml index 84cce91a..1835d9d4 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -52,4 +52,8 @@ jobs: - name: "Install Kind" run: go install sigs.k8s.io/kind@v0.20.0 - name: "Debug Kind" - run: kind create cluster --retain && docker logs kind-control-plane + continue-on-error: true + run: kind create cluster --retain + - name: "Get Kind Logs" + continue-on-error: true + run: docker logs kind-control-plane -- 2.45.2 From 5ba9a803de387273468aa5db6c85cc5eb6d6d3be Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 21 Jan 2024 17:19:39 -0700 Subject: [PATCH 36/43] Trigger k8s deploy test off changes to its scripts --- .gitea/workflows/test-k8s-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml index 93a445cf..40760e27 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -6,6 +6,8 @@ on: paths: - '!**' - '.gitea/workflows/triggers/fixturenet-laconicd-test' + - '.gitea/workflows/test-k8s-deploy.yml' + - 'tests/k8s-deploy/run-deploy-test.sh' jobs: test: -- 2.45.2 From a751e87dd47057a1609eb40582bfe34b3ae536ba Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 21 Jan 2024 17:21:35 -0700 Subject: [PATCH 37/43] Switch back to stock runner --- .gitea/workflows/test-k8s-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml index 40760e27..1471ebcc 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -12,7 +12,7 @@ on: jobs: test: name: "Run deploy test suite on kind/k8s" - runs-on: ubuntu-22.04-with-syn-ethdb + runs-on: ubuntu-22.04 steps: - name: "Clone project repository" uses: actions/checkout@v3 -- 2.45.2 From bc872b09fbbd1b37e6f68f11c0cc72e182c69973 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 21 Jan 2024 17:23:28 -0700 Subject: [PATCH 38/43] Add output to check cgroups version --- .gitea/workflows/test-k8s-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml index 1471ebcc..1a5bcfc9 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -36,6 +36,8 @@ jobs: run: ./scripts/create_build_tag_file.sh - name: "Build local shiv package" run: ./scripts/build_shiv_package.sh + - name: "Check cgroups version" + run: mount | grep cgroup - name: "Install kind" run: ./tests/scripts/install-kind.sh - name: "Install Kubectl" -- 2.45.2 From 6d5f661750d55d2ddd3e3290208162f32fbd3237 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 21 Jan 2024 17:42:09 -0700 Subject: [PATCH 39/43] Try a longer sleep --- tests/k8s-deploy/run-deploy-test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/k8s-deploy/run-deploy-test.sh b/tests/k8s-deploy/run-deploy-test.sh index 15eb2d3b..98f35dd2 100755 --- a/tests/k8s-deploy/run-deploy-test.sh +++ b/tests/k8s-deploy/run-deploy-test.sh @@ -120,7 +120,8 @@ fi # Stop then start again and check the volume was preserved $TEST_TARGET_SO deployment --dir $test_deployment_dir stop # Sleep a bit just in case -sleep 2 +# sleep for longer to check if that's why the subsequent create cluster fails +sleep 20 $TEST_TARGET_SO deployment --dir $test_deployment_dir start wait_for_pods_started wait_for_log_output -- 2.45.2 From d5244726aa5ecb58180f6631288c18f5d3c2e9d4 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 28 Jan 2024 16:25:45 -0700 Subject: [PATCH 40/43] Use new runner --- .gitea/workflows/test-k8s-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml index 92c76a7d..5aeb1a62 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -12,7 +12,7 @@ on: jobs: test: name: "Run deploy test suite on kind/k8s" - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04-with-syn-ethdb steps: - name: "Clone project repository" uses: actions/checkout@v3 -- 2.45.2 From 3c84ebff68bf88dea69bf5990059a8a4608f2a6c Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 30 Jan 2024 07:01:13 -0700 Subject: [PATCH 41/43] Switch back to stock runner --- .gitea/workflows/test-k8s-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml index 5aeb1a62..92c76a7d 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -12,7 +12,7 @@ on: jobs: test: name: "Run deploy test suite on kind/k8s" - runs-on: ubuntu-22.04-with-syn-ethdb + runs-on: ubuntu-22.04 steps: - name: "Clone project repository" uses: actions/checkout@v3 -- 2.45.2 From 466c149f36cbe168c6d78fd65b6971e1ba7b73d4 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 30 Jan 2024 07:39:05 -0700 Subject: [PATCH 42/43] Switch back to alternative runner --- .gitea/workflows/test-k8s-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml index 92c76a7d..5aeb1a62 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -12,7 +12,7 @@ on: jobs: test: name: "Run deploy test suite on kind/k8s" - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04-with-syn-ethdb steps: - name: "Clone project repository" uses: actions/checkout@v3 -- 2.45.2 From 3b553bb6606a59483973b6518f22edda7b048755 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 30 Jan 2024 11:13:21 -0700 Subject: [PATCH 43/43] Revert to the stock runner --- .gitea/workflows/test-k8s-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml index 5aeb1a62..92c76a7d 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -12,7 +12,7 @@ on: jobs: test: name: "Run deploy test suite on kind/k8s" - runs-on: ubuntu-22.04-with-syn-ethdb + runs-on: ubuntu-22.04 steps: - name: "Clone project repository" uses: actions/checkout@v3 -- 2.45.2