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.

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

[e2e] Remove disabling of Agent e2e tests because of 6331 #6611

Merged
merged 2 commits into from
Mar 29, 2023

Conversation

naemono
Copy link
Contributor

@naemono naemono commented Mar 28, 2023

closes #6331

Since issue from 6331 has been resolved, and is included in 8.8.0-SNAPSHOT, go ahead and remove the disabling of the Agent e2e tests and do not run them on 8.6.0 <= Agent stack < 8.8.0-SNAPSHOT

(Please someone double check my logic below, as I believe MinFor includes pre-release/snapshot)

if v.LT(version.MinFor(8, 8, 0)) && v.GE(version.MinFor(8, 6, 0)) {

Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
@naemono naemono added the >test Related to unit/integration/e2e tests label Mar 28, 2023
@thbkrkr
Copy link
Contributor

thbkrkr commented Mar 28, 2023

Isn't this also fixed in 8.7 and then we could only exclude 8.6.x?

@thbkrkr
Copy link
Contributor

thbkrkr commented Mar 28, 2023

buildkite test this -f p=gke,E2E_TAGS=agent,BUILD_LICENSE_PUBKEY=dev -m s=8.7.0-SNAPSHOT,s=8.8.0-SNAPSHOT

@naemono
Copy link
Contributor Author

naemono commented Mar 28, 2023

Isn't this also fixed in 8.7 and then we could only exclude 8.6.x?

From this comment I assumed 8.8.0-SNAPSHOT @thbkrkr but maybe I'm wrong?
#6331 (comment)

@thbkrkr
Copy link
Contributor

thbkrkr commented Mar 28, 2023

From this comment I assumed 8.8.0-SNAPSHOT @thbkrkr but maybe I'm wrong?

Indeed, it's confusing. I assumed 8.7.0-SNAPSHOT because elastic/elastic-agent#2352 has the label backport-v8.7.

My test with E2E_TAGS=agent didn't prove anything because tests we're interested in were skipped because of the condition if v.LT(version.MinFor(8, 8, 0)) { t.skipNow() }.

=== SKIP: test/e2e/agent TestFleetMode (0.00s)
=== SKIP: test/e2e/agent TestFleetKubernetesIntegrationRecipe (0.00s)
=== SKIP: test/e2e/agent TestFleetCustomLogsIntegrationRecipe (0.00s)
=== SKIP: test/e2e/agent TestFleetAPMIntegrationRecipe (0.00s)
=== SKIP: test/e2e/agent TestFleetAgentWithoutTLS (0.00s)

@naemono
Copy link
Contributor Author

naemono commented Mar 28, 2023

@thbkrkr I'll go ahead and adjust to 8.7.0-snap and run a set of tests, and we'll see...

Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
@thbkrkr
Copy link
Contributor

thbkrkr commented Mar 28, 2023

It's good in 8.8.0-SNAPSHOT :)

--- PASS: TestFleetMode (378.83s)
--- PASS: TestSystemIntegrationRecipe (154.15s)
--- PASS: TestKubernetesIntegrationRecipe (114.68s)
--- PASS: TestMultiOutputRecipe (288.36s)
--- PASS: TestFleetKubernetesIntegrationRecipe (384.84s)
--- PASS: TestFleetCustomLogsIntegrationRecipe (273.16s)
--- PASS: TestFleetAPMIntegrationRecipe (275.64s)
--- PASS: TestFleetAgentWithoutTLS (364.27s)

You can trigger with t=TestFleet to be more selective.

@thbkrkr
Copy link
Contributor

thbkrkr commented Mar 28, 2023

buildkite test this -f p=gke,t=TestFleet,BUILD_LICENSE_PUBKEY=dev -m s=8.7.0-SNAPSHOT,s=8.8.0-SNAPSHOT

@naemono
Copy link
Contributor Author

naemono commented Mar 29, 2023

@thbkrkr all tests passed with 8.7 so I'd say we leave it there..

Copy link
Contributor

@thbkrkr thbkrkr left a comment

Choose a reason for hiding this comment

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

e2e-87-testfleet.xml:name="TestFleetMode" time="348.160000">
e2e-87-testfleet.xml:name="TestFleetKubernetesIntegrationRecipe" time="375.720000">
e2e-87-testfleet.xml:name="TestFleetCustomLogsIntegrationRecipe" time="344.520000">
e2e-87-testfleet.xml:name="TestFleetAPMIntegrationRecipe" time="359.780000">
e2e-87-testfleet.xml:name="TestFleetAgentWithoutTLS" time="401.400000">

e2e-88-testfleet.xml:name="TestFleetMode" time="368.290000">
e2e-88-testfleet.xml:name="TestFleetKubernetesIntegrationRecipe" time="340.400000">
e2e-88-testfleet.xml:name="TestFleetCustomLogsIntegrationRecipe" time="377.040000">
e2e-88-testfleet.xml:name="TestFleetAPMIntegrationRecipe" time="352.830000">
e2e-88-testfleet.xml:name="TestFleetAgentWithoutTLS" time="288.850000">

@naemono naemono merged commit 348d5a6 into elastic:main Mar 29, 2023
@naemono naemono deleted the 6331-remove-disabled-agent-e2e-tests branch March 29, 2023 12:12
thbkrkr pushed a commit to thbkrkr/cloud-on-k8s that referenced this pull request Mar 29, 2023
* Remove disabling of agent e2e tests because of 6331.

Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
thbkrkr pushed a commit to thbkrkr/cloud-on-k8s that referenced this pull request Mar 29, 2023
* Remove disabling of agent e2e tests because of 6331.

Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
thbkrkr pushed a commit that referenced this pull request Mar 29, 2023
* Remove disabling of agent e2e tests because of 6331.

Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>test Related to unit/integration/e2e tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TestFleet* fail on 8.6.x
2 participants