From b4fbee9b1382602200d37dd53077657e54acfbc4 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Mon, 22 Jan 2024 07:43:38 -0700 Subject: [PATCH 01/10] Update fixturenet-laconicd-test --- .gitea/workflows/triggers/fixturenet-laconicd-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/triggers/fixturenet-laconicd-test b/.gitea/workflows/triggers/fixturenet-laconicd-test index e6b73875..9d2d29fb 100644 --- a/.gitea/workflows/triggers/fixturenet-laconicd-test +++ b/.gitea/workflows/triggers/fixturenet-laconicd-test @@ -1,2 +1,2 @@ Change this file to trigger running the fixturenet-laconicd-test CI job - +Trigger From 554f05de872a51100c5f01c85b2cb83943ebdd24 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Mon, 22 Jan 2024 21:06:15 -0600 Subject: [PATCH 02/10] Fix pip3 error (#709) --- .../container-build/cerc-fixturenet-eth-genesis/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stack_orchestrator/data/container-build/cerc-fixturenet-eth-genesis/Dockerfile b/stack_orchestrator/data/container-build/cerc-fixturenet-eth-genesis/Dockerfile index 7445b026..4fa8d0fd 100644 --- a/stack_orchestrator/data/container-build/cerc-fixturenet-eth-genesis/Dockerfile +++ b/stack_orchestrator/data/container-build/cerc-fixturenet-eth-genesis/Dockerfile @@ -10,9 +10,10 @@ COPY genesis /opt/genesis COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/ COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/ COPY --from=ethgen /apps /apps -RUN cd /apps/el-gen && pip3 install -r requirements.txt +RUN cd /apps/el-gen && pip3 install --break-system-packages -r requirements.txt # web3==5.24.0 used by el-gen is broken on python 3.11 -RUN pip3 install --upgrade "web3==6.5.0" +RUN pip3 install --break-system-packages --upgrade "web3==6.5.0" +RUN pip3 install --break-system-packages --upgrade "typing-extensions" # Build genesis config RUN apk add --no-cache make bash envsubst jq From 5fdee25dc13a3c24196d5d250810fd2a7eca3953 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 23 Jan 2024 09:25:02 -0700 Subject: [PATCH 03/10] update laconicd test (#710) * Remove legacy docker config * Trigger test run --- .gitea/workflows/fixturenet-laconicd-test.yml | 8 -------- .gitea/workflows/triggers/fixturenet-laconicd-test | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitea/workflows/fixturenet-laconicd-test.yml b/.gitea/workflows/fixturenet-laconicd-test.yml index ac397dad..e9372552 100644 --- a/.gitea/workflows/fixturenet-laconicd-test.yml +++ b/.gitea/workflows/fixturenet-laconicd-test.yml @@ -7,10 +7,6 @@ on: - '!**' - '.gitea/workflows/triggers/fixturenet-laconicd-test' -# Needed until we can incorporate docker startup into the executor container -env: - DOCKER_HOST: unix:///var/run/dind.sock - jobs: test: @@ -47,9 +43,5 @@ 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-laconicd tests" run: ./tests/fixturenet-laconicd/run-test.sh diff --git a/.gitea/workflows/triggers/fixturenet-laconicd-test b/.gitea/workflows/triggers/fixturenet-laconicd-test index 9d2d29fb..ad09df27 100644 --- a/.gitea/workflows/triggers/fixturenet-laconicd-test +++ b/.gitea/workflows/triggers/fixturenet-laconicd-test @@ -1,2 +1,3 @@ Change this file to trigger running the fixturenet-laconicd-test CI job Trigger +Trigger From 7d0f2adb469ce81aa4abacff7cbece995c4b68ce Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 23 Jan 2024 09:42:24 -0700 Subject: [PATCH 04/10] Enable scheduled test run (#711) --- .gitea/workflows/fixturenet-laconicd-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/fixturenet-laconicd-test.yml b/.gitea/workflows/fixturenet-laconicd-test.yml index e9372552..f3115d08 100644 --- a/.gitea/workflows/fixturenet-laconicd-test.yml +++ b/.gitea/workflows/fixturenet-laconicd-test.yml @@ -6,7 +6,8 @@ on: paths: - '!**' - '.gitea/workflows/triggers/fixturenet-laconicd-test' - + schedule: + - cron: '10 17 * * *' # TODO: add a run at 01 UTC once this is known to work jobs: test: From cef73d8de2a292a30e1cd6a78ae438c62eb354c5 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 23 Jan 2024 10:32:44 -0700 Subject: [PATCH 05/10] Update fixturenet-laconicd-test schedule --- .gitea/workflows/fixturenet-laconicd-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/fixturenet-laconicd-test.yml b/.gitea/workflows/fixturenet-laconicd-test.yml index f3115d08..67f3797e 100644 --- a/.gitea/workflows/fixturenet-laconicd-test.yml +++ b/.gitea/workflows/fixturenet-laconicd-test.yml @@ -7,7 +7,7 @@ on: - '!**' - '.gitea/workflows/triggers/fixturenet-laconicd-test' schedule: - - cron: '10 17 * * *' # TODO: add a run at 01 UTC once this is known to work + - cron: '1 13 * * *' jobs: test: From aa0f60baa1bb5669cdf653b9a442430f54cf94a6 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 25 Jan 2024 06:46:18 -0700 Subject: [PATCH 06/10] Trigger fixturenet-eth-plugeth-test run --- .gitea/workflows/triggers/fixturenet-eth-plugeth-test | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/triggers/fixturenet-eth-plugeth-test b/.gitea/workflows/triggers/fixturenet-eth-plugeth-test index e0c6da50..ca2c643e 100644 --- a/.gitea/workflows/triggers/fixturenet-eth-plugeth-test +++ b/.gitea/workflows/triggers/fixturenet-eth-plugeth-test @@ -1,2 +1,3 @@ Change this file to trigger running the fixturenet-eth-plugeth-test CI job trigger +trigger From 0a302ea555cc6c9a344fa1067cf5d572a0b2a85e Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 25 Jan 2024 07:33:44 -0700 Subject: [PATCH 07/10] Add a schedule for fixturenet-eth-plugeth-test --- .gitea/workflows/fixturenet-eth-plugeth-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/fixturenet-eth-plugeth-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-test.yml index 739e33b0..11bca169 100644 --- a/.gitea/workflows/fixturenet-eth-plugeth-test.yml +++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml @@ -6,6 +6,8 @@ on: paths: - '!**' - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test' + schedule: # Note: coordinate with other tests to not overload runners at the same time of day + - cron: '2 14 * * *' # Needed until we can incorporate docker startup into the executor container env: From b9128841e4caf90b29cf50979d650a778127bd13 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 25 Jan 2024 11:42:07 -0700 Subject: [PATCH 08/10] Switch test 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 edd87177..3c482d81 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -10,7 +10,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 From eca52b10b7a2a0725588b6ebdbd162c758a06b61 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 25 Jan 2024 11:46:50 -0700 Subject: [PATCH 09/10] Fix copy-paste error --- .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 3c482d81..b9463aa7 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -5,7 +5,7 @@ on: branches: '*' paths: - '!**' - - '.gitea/workflows/triggers/fixturenet-laconicd-test' + - '.gitea/workflows/triggers/test-k8s-deploy' jobs: test: From b7f215d9bfba3e6bd1b9d8b3068077e213500180 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 28 Jan 2024 16:21:39 -0700 Subject: [PATCH 10/10] k8s test fixes (#713) * Add cgroup setup, increase test timeouts * Trigger from test script or CI job changes too --- .gitea/workflows/test-k8s-deploy.yml | 7 ++++++- tests/k8s-deploy/run-deploy-test.sh | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml index b9463aa7..208b8b0c 100644 --- a/.gitea/workflows/test-k8s-deploy.yml +++ b/.gitea/workflows/test-k8s-deploy.yml @@ -6,6 +6,8 @@ on: paths: - '!**' - '.gitea/workflows/triggers/test-k8s-deploy' + - '.gitea/workflows/test-k8s-deploy.yml' + - 'tests/k8s-deploy/run-deploy-test.sh' jobs: test: @@ -39,4 +41,7 @@ jobs: - name: "Install Kubectl" run: ./tests/scripts/install-kubectl.sh - name: "Run k8s deployment test" - run: ./tests/k8s-deploy/run-deploy-test.sh + run: | + source /opt/bash-utils/cgroup-helper.sh + join_cgroup + ./tests/k8s-deploy/run-deploy-test.sh diff --git a/tests/k8s-deploy/run-deploy-test.sh b/tests/k8s-deploy/run-deploy-test.sh index 15eb2d3b..0c7246e0 100755 --- a/tests/k8s-deploy/run-deploy-test.sh +++ b/tests/k8s-deploy/run-deploy-test.sh @@ -9,7 +9,7 @@ fi # Helper functions: TODO move into a separate file wait_for_pods_started () { - for i in {1..5} + for i in {1..50} do local ps_output=$( $TEST_TARGET_SO deployment --dir $test_deployment_dir ps ) @@ -27,7 +27,7 @@ wait_for_pods_started () { } wait_for_log_output () { - for i in {1..5} + for i in {1..50} do local log_output=$( $TEST_TARGET_SO deployment --dir $test_deployment_dir logs )