From b7f215d9bfba3e6bd1b9d8b3068077e213500180 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sun, 28 Jan 2024 16:21:39 -0700 Subject: [PATCH] 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 )