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

Jump to bottom

[test-infra-definitions][automated] Bump test-infra-definitions to 6c7a0d456c6f70399a28c9b4740bcd1ec94560a3 #31035

Merged
merged 3 commits into from
Nov 14, 2024
+11 −9
Merged

[test-infra-definitions][automated] Bump test-infra-definitions to 6c7a0d456c6f70399a28c9b4740bcd1ec94560a3 #31035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f25017b
[test-infra-definitions][automated] Bump test-infra-definitions to 6c…
agent-platform-auto-pr[bot] Nov 13, 2024
c98e14f
Fix existing tests
KevinFairise2 Nov 13, 2024
99a1dfd
Fix orchestrator test
KevinFairise2 Nov 13, 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 .gitlab/common/test_infra_version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ variables:
# and check the job creating the image to make sure you have the right SHA prefix
TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""
# Make sure to update test-infra-definitions version in go.mod as well
TEST_INFRA_DEFINITIONS_BUILDIMAGES: ec7e1e40abcd
TEST_INFRA_DEFINITIONS_BUILDIMAGES: 6c7a0d456c6f
2 changes: 1 addition & 1 deletion test/new-e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ require (
// `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version
// Example: github.com/DataDog/test-infra-definitions v0.0.0-YYYYMMDDHHmmSS-0123456789AB
// => TEST_INFRA_DEFINITIONS_BUILDIMAGES: 0123456789AB
github.com/DataDog/test-infra-definitions v0.0.0-20241112113900-ec7e1e40abcd
github.com/DataDog/test-infra-definitions v0.0.0-20241113143207-6c7a0d456c6f
github.com/aws/aws-sdk-go-v2 v1.32.2
github.com/aws/aws-sdk-go-v2/config v1.27.40
github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2
Expand Down
4 changes: 2 additions & 2 deletions test/new-e2e/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/new-e2e/pkg/environments/aws/kubernetes/kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func KindRunFunc(ctx *pulumi.Context, env *environments.Kubernetes, params *Prov
return err
}

kindCluster, err := kubeComp.NewKindCluster(&awsEnv, host, awsEnv.CommonNamer().ResourceName("kind"), params.name, awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
kindCluster, err := kubeComp.NewKindCluster(&awsEnv, host, params.name, awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion test/new-e2e/pkg/environments/local/kubernetes/kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func KindRunFunc(ctx *pulumi.Context, env *environments.Kubernetes, params *Prov
return err
}

kindCluster, err := kubeComp.NewLocalKindCluster(&localEnv, localEnv.CommonNamer().ResourceName("kind"), params.name, localEnv.KubernetesVersion())
kindCluster, err := kubeComp.NewLocalKindCluster(&localEnv, params.name, localEnv.KubernetesVersion())
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion test/new-e2e/tests/agent-metrics-logs/kindfilelogging/kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func KindRunFunc(ctx *pulumi.Context, env *environments.Kubernetes, params *Prov
return fmt.Errorf("ec2.InstallECRCredentialsHelper %w", err)
}

kindCluster, err := kubeComp.NewKindCluster(&awsEnv, host, awsEnv.CommonNamer().ResourceName("kind"), params.name, awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
kindCluster, err := kubeComp.NewKindCluster(&awsEnv, host, params.name, awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
if err != nil {
return fmt.Errorf("kubeComp.NewKindCluster: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion test/new-e2e/tests/orchestrator/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func createCluster(ctx *pulumi.Context) (*resAws.Environment, *localKubernetes.C
return nil, nil, nil, err
}

kindCluster, err := localKubernetes.NewKindCluster(&awsEnv, vm, awsEnv.CommonNamer().ResourceName("kind"), "kind", awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
kindCluster, err := localKubernetes.NewKindCluster(&awsEnv, vm, "kind", awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
if err != nil {
return nil, nil, nil, err
}
Expand Down
4 changes: 3 additions & 1 deletion test/new-e2e/tests/orchestrator/k8s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
package orchestrator

import (
"fmt"
"strings"
"time"

agentmodel "github.com/DataDog/agent-payload/v5/process"

"github.com/DataDog/datadog-agent/test/fakeintake/aggregator"
fakeintake "github.com/DataDog/datadog-agent/test/fakeintake/client"
)
Expand All @@ -32,7 +34,7 @@ func (suite *k8sSuite) TestNode() {
expectAtLeastOneResource{
filter: &fakeintake.PayloadFilter{ResourceType: agentmodel.TypeCollectorNode},
test: func(payload *aggregator.OrchestratorPayload) bool {
return payload.Node.Metadata.Name == "kind-control-plane"
return payload.Node.Metadata.Name == fmt.Sprintf("%s-control-plane", suite.KubeClusterName)
},
message: "find a control plane node",
timeout: defaultTimeout,
Expand Down
Loading