Skip to content

Commit

Permalink
[AMLII-1850] Fixing path used to trigger AML e2e tests (#27038)
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosroman authored and pull[bot] committed Oct 18, 2024
1 parent edea332 commit a009270
Show file tree
Hide file tree
Showing 29 changed files with 37 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@
/test/new-e2e/tests/process @DataDog/processes
/test/new-e2e/tests/sysprobe-functional @DataDog/windows-kernel-integrations
/test/new-e2e/tests/cws @DataDog/agent-security
/test/new-e2e/tests/agent-metric-logs @DataDog/agent-metrics-logs
/test/new-e2e/tests/agent-metrics-logs @DataDog/agent-metrics-logs
/test/new-e2e/tests/windows @DataDog/windows-agent @DataDog/windows-kernel-integrations
/test/new-e2e/tests/apm @DataDog/agent-apm
/test/new-e2e/tests/remote-config @DataDog/remote-config
Expand Down
23 changes: 22 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -893,8 +893,29 @@ workflow:
- !reference [.on_e2e_main_release_or_rc]
- changes:
paths:
# TODO: Add paths that should trigger tests for AML
- test/new-e2e/tests/agent-metrics-logs/**/*
- cmd/agent/subcommands/dogstatsd*/*
- cmd/agent/subcommands/streamlogs/*
- cmd/dogstatsd/**/*
- comp/agent/jmxlogger/**/*
- comp/aggregator/**/*
- comp/collector/**/*
- comp/core/agenttelemetry/**/*
- comp/core/autodiscovery/providers/config_reader*.go
- comp/core/autodiscovery/providers/file*.go
- comp/forwarder/**/*
- comp/logs/**/*
- comp/serializer/compression/**/*
- pkg/aggregator/**/*
- pkg/collector/**/*
- pkg/commonchecks/**/*
- pkg/dogstatsd/**/*
- pkg/jmxfetch/**/*
- pkg/logs/**/*
- pkg/metrics/**/*
- pkg/persistentcache/**/*
- pkg/serializer/**/*
- rtloader/**/*
compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916

.on_cws_or_e2e_changes:
Expand Down
4 changes: 2 additions & 2 deletions .gitlab/e2e/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ new-e2e-aml:
- !reference [.on_aml_or_e2e_changes]
- !reference [.manual]
variables:
TARGETS: ./tests/agent-metric-logs
TEAM: agent-metric-logs
TARGETS: ./tests/agent-metrics-logs
TEAM: agent-metrics-logs

new-e2e-cws:
extends: .new_e2e_template
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
kindfilelogger "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/kindfilelogging"
kindfilelogger "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/kindfilelogging"
)

type k8sCCAOffSuite struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
kindfilelogger "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/kindfilelogging"
kindfilelogger "github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/kindfilelogging"
)

type k8sSuite struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments/aws/host"
"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils"
"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils"
"github.com/DataDog/test-infra-definitions/components/datadog/agentparams"
)

Expand All @@ -26,7 +26,7 @@ type LinuxFakeintakeSuite struct {
e2e.BaseSuite[environments.Host]
}

//go:embed log-config/config.yaml
//go:embed config/config.yaml
var logConfig string

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments/aws/host"
"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils"
"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils"
)

//go:embed log-config/automulti.yaml
//go:embed config/automulti.yaml
var autoMultiLineConfig string

//go:embed log-config/pattern.yaml
//go:embed config/pattern.yaml
var multiLineLogPatternConfig string

const singleLineLog = "This is a single line log"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"github.com/stretchr/testify/assert"
)

//go:embed log-config/utf-16-le.yaml
//go:embed config/utf-16-le.yaml
var utfLittleEndianLogConfig []byte

//go:embed log-config/utf-16-be.yaml
//go:embed config/utf-16-be.yaml
var utfBigEndianLogConfig []byte

const utfservice = "utfservice"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments/aws/host"
"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils"
"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils"
"github.com/DataDog/test-infra-definitions/components/datadog/agentparams"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"testing"
"time"

"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils"
"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils"

"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments/aws/host"
"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metric-logs/log-agent/utils"
"github.com/DataDog/datadog-agent/test/new-e2e/tests/agent-metrics-logs/log-agent/utils"
"github.com/DataDog/test-infra-definitions/components/datadog/agentparams"
testos "github.com/DataDog/test-infra-definitions/components/os"
"github.com/DataDog/test-infra-definitions/scenarios/aws/ec2"
Expand Down

0 comments on commit a009270

Please sign in to comment.