Skip to content

[system tests] Allow setting an optional prefix for the service TestRunID #2744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 18, 2025
Merged

[system tests] Allow setting an optional prefix for the service TestRunID #2744

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
279f64c
Allow to set a prefix for the Service TestRunID in system tests
mrodm Jul 17, 2025
3c5c9c4
Update test package to use TestRunID
mrodm Jul 17, 2025
cb94a11
Use environment.WithElasticPackagePrefix to set the env name
mrodm Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion internal/common/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ func ToStringSlice(val interface{}) ([]string, error) {
}

func CreateTestRunID() string {
return fmt.Sprintf("%d", rand.Intn(testRunMaxID-testRunMinID)+testRunMinID)
return CreateTestRunIDWithPrefix("")
}
Comment on lines 60 to +62
Copy link
Contributor Author

@mrodm mrodm Jul 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is used also in other places (e.g. adding a random suffix to policies), those can be kept as they are now.

For instance:

elastic-package/internal/testrunner/runners/system/tester.go

Line 1021 in be35e60

Namespace: common.CreateTestRunID(),


func CreateTestRunIDWithPrefix(prefix string) string {
return fmt.Sprintf("%s%d", prefix, rand.Intn(testRunMaxID-testRunMinID)+testRunMinID)
}

func ProcessResourceApplyResults(results resource.ApplyResults) string {
Expand Down
7 changes: 6 additions & 1 deletion internal/testrunner/runners/system/tester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,12 @@ func (r *tester) createServiceInfo() (servicedeployer.ServiceInfo, error) {
svcInfo.Name = r.testFolder.Package
svcInfo.Logs.Folder.Local = r.locationManager.ServiceLogDir()
svcInfo.Logs.Folder.Agent = ServiceLogsAgentDir
svcInfo.Test.RunID = common.CreateTestRunID()

prefix := ""
if v, found := os.LookupEnv("ELASTIC_PACKAGE_PREFIX_SERVICE_TEST_RUN_ID"); found && v != "" {
prefix = v
}
svcInfo.Test.RunID = common.CreateTestRunIDWithPrefix(prefix)
Copy link
Contributor Author

@mrodm mrodm Jul 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case of using the terraform service deployer, a part of updating the RunID used in as terraform variable, the alias used to render the policy templates in tests needs to be set to the same value as the terraform variable. This is needed for instance for aws.ec2_metrics that filters by the some resource name.


if r.runTearDown || r.runTestsOnly {
logger.Debug("Skip creating output directory")
Expand Down
2 changes: 1 addition & 1 deletion test/packages/parallel/terraform_local/data_stream/local/_dev/deploy/tf/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource "local_file" "log" {
source = "./files/example.log"
filename = "/tmp/service_logs/file.log"
filename = "/tmp/service_logs/file-${var.TEST_RUN_ID}.log"
file_permission = "0777"
}

Expand Down
4 changes: 4 additions & 0 deletions test/packages/parallel/terraform_local/data_stream/local/_dev/deploy/tf/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ variable "ENVIRONMENT" {
variable "REPO" {
default = "unknown-repo-name"
}

variable "TEST_RUN_ID" {
default = "detached"
}
2 changes: 1 addition & 1 deletion ...kages/parallel/terraform_local/data_stream/local/_dev/test/system/test-default-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ wait_for_data_timeout: 1m
data_stream:
vars:
paths:
- "{{ SERVICE_LOGS_DIR }}/file.log"
- "{{ SERVICE_LOGS_DIR }}/file-{{ TEST_RUN_ID }}.log"
- "{{ SERVICE_LOGS_DIR }}/file_vars.log"
assert:
hit_count: 2
4 changes: 0 additions & 4 deletions test/packages/parallel/terraform_local/data_stream/outputs/_dev/deploy/tf/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
variable "TEST_RUN_ID" {
default = "detached"
}

resource "local_file" "log" {
source = "./files/example.log"
filename = "/tmp/service_logs/${var.TEST_RUN_ID}.log"
Expand Down
4 changes: 4 additions & 0 deletions test/packages/parallel/terraform_local/data_stream/outputs/_dev/deploy/tf/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ variable "ENVIRONMENT" {
variable "REPO" {
default = "unknown-repo-name"
}

variable "TEST_RUN_ID" {
default = "detached"
}