From b2d25cd4d1081f287e1e8a62dfefc6526fa95479 Mon Sep 17 00:00:00 2001 From: kcreddy Date: Tue, 6 May 2025 11:43:26 +0530 Subject: [PATCH 1/2] Increase TestRunID suffix to 6 digits to avoid clash with existing test resources. --- internal/common/helpers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/common/helpers.go b/internal/common/helpers.go index 0609936bf1..b53445f261 100644 --- a/internal/common/helpers.go +++ b/internal/common/helpers.go @@ -14,8 +14,8 @@ import ( ) const ( - testRunMaxID = 99999 - testRunMinID = 10000 + testRunMaxID = 999999 + testRunMinID = 100000 ) // TrimStringSlice removes whitespace from the beginning and end of the contents of a []string. From 242b3197786043d9e52d2eaf18e25a5b61779905 Mon Sep 17 00:00:00 2001 From: kcreddy Date: Tue, 6 May 2025 14:07:20 +0530 Subject: [PATCH 2/2] address PR comments from Mario --- scripts/test-system-test-flags.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test-system-test-flags.sh b/scripts/test-system-test-flags.sh index b8665b7f69..8358b88b4f 100755 --- a/scripts/test-system-test-flags.sh +++ b/scripts/test-system-test-flags.sh @@ -266,9 +266,9 @@ run_tests_for_package() { # Set variables depending on whether or not independent Elastic Agents are running -DEFAULT_AGENT_CONTAINER_NAME="elastic-package-service-[0-9]{5}-docker-custom-agent" +DEFAULT_AGENT_CONTAINER_NAME="elastic-package-service-[0-9]{6}-docker-custom-agent" service_deployer_type="docker" -service_prefix='elastic-package-service-[0-9]{5}' +service_prefix='elastic-package-service-[0-9]{6}' if [[ "${ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT:-"false"}" == "true" ]]; then service_deployer_type="agent" fi