Skip to content
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

Add suffix to compose project names #1846

Merged
merged 2 commits into from
May 21, 2024
Merged

Add suffix to compose project names #1846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ba7399
Add suffic to compose project names
mrodm May 20, 2024
0386a8f
Add regex to default agent container name
mrodm May 20, 2024
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
2 changes: 1 addition & 1 deletion internal/servicedeployer/custom_agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (d *CustomAgentDeployer) SetUp(ctx context.Context, svcInfo ServiceInfo) (D

service := dockerComposeDeployedService{
ymlPaths: ymlPaths,
project: "elastic-package-service",
project: fmt.Sprintf("elastic-package-service-%s", svcInfo.Test.RunID),
Copy link
Contributor Author

@mrodm mrodm May 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I've updated this service deployer to keep consistency.
But it would not be needed, since this deployer is not used with independent Elastic Agents.

Would it be better to revert the change in this file?

This would make mandatory to change test configuration files for oracle package using the placeholders {{Hostname}} and {{Port}}.

Copy link
Member

Choose a reason for hiding this comment

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

Well, it doesn't do any harm, right? Keep the change in case this continues to be used.

variant: ServiceVariant{
Name: dockerCustomAgentName,
Env: env,
Expand Down
2 changes: 1 addition & 1 deletion internal/servicedeployer/terraform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (tsd TerraformServiceDeployer) SetUp(ctx context.Context, svcInfo ServiceIn

service := dockerComposeDeployedService{
ymlPaths: ymlPaths,
project: "elastic-package-service",
project: fmt.Sprintf("elastic-package-service-%s", svcInfo.Test.RunID),
env: tfEnvironment,
shutdownTimeout: 300 * time.Second,
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-system-test-flags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -euxo pipefail

DEFAULT_AGENT_CONTAINER_NAME="elastic-package-service-docker-custom-agent"
DEFAULT_AGENT_CONTAINER_NAME="elastic-package-service-[0-9]{5}-docker-custom-agent"

cleanup() {
local r=$?
Expand Down