Skip to content

Commit 7e486ae

Browse files
authored
Revert "[SBOM] Test SBOM generation for multiple images and scanning methods" (#44170)
Reverts #43792 This PR introduces flakiness on subsequent tests that run as part of this suite, and adopts some testing paradigms which we are not sure we wish to have as part of this suite (namely, flushing the fakeintake and redeploying the agent multiple times as part of one of the tests). It also assumes that every SBOM generation method works for every container runtime, which would prevent us from adding tests for runtimes where we know this is not the case (such as openshift + cri-o) Co-authored-by: steven.blumenthal <steven.blumenthal@datadoghq.com>
1 parent b102d0e commit 7e486ae

File tree

3 files changed

+131
-252
lines changed

3 files changed

+131
-252
lines changed

test/new-e2e/tests/containers/eks_test.go

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
sceneks "github.com/DataDog/datadog-agent/test/e2e-framework/scenarios/aws/eks"
1515

1616
"github.com/DataDog/datadog-agent/test/e2e-framework/testing/e2e"
17-
"github.com/DataDog/datadog-agent/test/e2e-framework/testing/provisioners"
1817
proveks "github.com/DataDog/datadog-agent/test/e2e-framework/testing/provisioners/aws/kubernetes/eks"
1918
)
2019

@@ -23,27 +22,21 @@ type eksSuite struct {
2322
}
2423

2524
func TestEKSSuite(t *testing.T) {
26-
newProvisioner := func(helmValues string) provisioners.Provisioner {
27-
return proveks.Provisioner(
28-
proveks.WithRunOptions(
29-
sceneks.WithEKSOptions(
30-
sceneks.WithLinuxNodeGroup(),
31-
sceneks.WithWindowsNodeGroup(),
32-
sceneks.WithBottlerocketNodeGroup(),
33-
sceneks.WithLinuxARMNodeGroup(),
34-
sceneks.WithUseAL2023Nodes(),
35-
),
36-
sceneks.WithDeployDogstatsd(),
37-
sceneks.WithDeployTestWorkload(),
38-
sceneks.WithAgentOptions(
39-
kubernetesagentparams.WithDualShipping(),
40-
kubernetesagentparams.WithHelmValues(helmValues),
41-
),
42-
sceneks.WithDeployArgoRollout(),
25+
e2e.Run(t, &eksSuite{}, e2e.WithProvisioner(proveks.Provisioner(
26+
proveks.WithRunOptions(
27+
sceneks.WithEKSOptions(
28+
sceneks.WithLinuxNodeGroup(),
29+
sceneks.WithWindowsNodeGroup(),
30+
sceneks.WithBottlerocketNodeGroup(),
31+
sceneks.WithLinuxARMNodeGroup(),
32+
sceneks.WithUseAL2023Nodes(),
4333
),
44-
)
45-
}
46-
e2e.Run(t, &eksSuite{k8sSuite{newProvisioner: newProvisioner, skipModes: []string{"overlayfs"}}}, e2e.WithProvisioner(newProvisioner("")))
34+
sceneks.WithDeployDogstatsd(),
35+
sceneks.WithDeployTestWorkload(),
36+
sceneks.WithAgentOptions(kubernetesagentparams.WithDualShipping()),
37+
sceneks.WithDeployArgoRollout(),
38+
),
39+
)))
4740
}
4841

4942
func (suite *eksSuite) SetupSuite() {

0 commit comments

Comments
 (0)