Skip to content

Updated the smoke tests scripts to use the end-to-end tests#5903

Merged
dlvenable merged 3 commits intoopensearch-project:mainfrom
dlvenable:3568-e2e-smoke-tests
Jul 28, 2025
Merged

Updated the smoke tests scripts to use the end-to-end tests#5903
dlvenable merged 3 commits intoopensearch-project:mainfrom
dlvenable:3568-e2e-smoke-tests

Conversation

@dlvenable
Copy link
Copy Markdown
Member

@dlvenable dlvenable commented Jul 25, 2025 •
edited
Loading

Description

The Data Prepper smoke tests have been failing during release for a long time. This PR is the last step in #3524 to update the smoke tests to run the e2e-tests. This gives consistency across tests.

With this change, the smoke tests run three select end-to-end tests.

  • :e2e-test:log:basicLogEndToEndTest
  • :e2e-test:trace:rawSpanPeerForwarderEndToEndTest
  • :e2e-test:trace:serviceMapPeerForwarderEndToEndTest

I tested this by pushing to the main branch of my fork and running the Release workflow.

You can see the results here:

https://github.com/dlvenable/data-prepper/actions/runs/16525916962

3524-test-run

Note that the Promote job fails for unrelated reasons.

Issues Resolved

Resolves #3568

Check List

  • New functionality includes testing.
  • New functionality has a documentation issue. Please link to it in this PR.
    • New functionality has javadoc added
  • Commits are signed with a real name per the DCO

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@dlvenable
Updated the smoke tests scripts to use the end-to-end tests to get th…
129d92f 
…em running as part of the release again.

Signed-off-by: David Venable <dlv@amazon.com>
@dlvenable
Copy link
Copy Markdown
Member Author

dlvenable commented Jul 25, 2025 •
edited
Loading

Sample logs from validate-docker:

> Task :e2e-test:trace:createDataPrepperNetwork
Creating network 'data_prepper_network'.
Created network with ID 'e89b7998fc6899c70aacf027efd70e3a943b6e5599f9d50fc19d7536fe6b2504'.

> Task :e2e-test:trace:pullOpenSearchDockerImage
Pulling image 'opensearchproject/opensearch:1.3.14' from [https://index.docker.io/v1/.](https://index.docker.io/v1/)

> Task :e2e-test:trace:createOpenSearchDockerContainer
Created container with ID 'node-0.example.com'.

> Task :e2e-test:trace:startOpenSearchDockerContainer
Starting container with ID '8b21acb7c9743eb9e4f13b6490435185b7e602eb58bc4d7305e11b45515ea0be'.

> Task :e2e-test:trace:pullDataPrepperDockerImage
Pulling image '***:2.13.0-SNAPSHOT-60' from public.ecr.aws.

> Task :e2e-test:trace:dataPrepperDockerImage

> Task :e2e-test:trace:createserviceMapPeerForwarderEndToEndTest0
Created container with ID 'data-prepper-0'.

> Task :e2e-test:trace:startserviceMapPeerForwarderEndToEndTest0
Starting container with ID 'cd4fcbcc8a0211419abd703bcfc257d55f0ab1c14d5b8f45e217e9e9c807c15c'.

> Task :e2e-test:trace:createserviceMapPeerForwarderEndToEndTest1
Created container with ID 'data-prepper-1'.

> Task :e2e-test:trace:startserviceMapPeerForwarderEndToEndTest1
Starting container with ID 'f30da4962ddf5d424a9f682587000f6d014df653806ee828d5a2a62582df29eb'.

> Task :e2e-test:trace:startserviceMapPeerForwarderEndToEndTestAll
> Task :e2e-test:trace:serviceMapPeerForwarderEndToEndTest

> Task :e2e-test:trace:stopOpenSearchDockerContainer
Stopping container with ID '8b21acb7c9743eb9e4f13b6490435185b7e602eb58bc4d7305e11b45515ea0be'.

> Task :e2e-test:trace:stopserviceMapPeerForwarderEndToEndTest0
Stopping container with ID 'cd4fcbcc8a0211419abd703bcfc257d55f0ab1c14d5b8f45e217e9e9c807c15c'.

> Task :e2e-test:trace:removeserviceMapPeerForwarderEndToEndTest0
Removing container with ID 'cd4fcbcc8a0211419abd703bcfc257d55f0ab1c14d5b8f45e217e9e9c807c15c'.

> Task :e2e-test:trace:stopserviceMapPeerForwarderEndToEndTest1
Stopping container with ID 'f30da4962ddf5d424a9f682587000f6d014df653806ee828d5a2a62582df29eb'.

> Task :e2e-test:trace:removeserviceMapPeerForwarderEndToEndTest1
Removing container with ID 'f30da4962ddf5d424a9f682587000f6d014df653806ee828d5a2a62582df29eb'.

> Task :e2e-test:trace:removeserviceMapPeerForwarderEndToEndTestAll

> Task :e2e-test:trace:removeDataPrepperNetwork
Removing network 'e89b7998fc6899c70aacf027efd70e3a943b6e5599f9d50fc19d7536fe6b2504'.

Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0.

You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.

For more on this, please refer to https://docs.gradle.org/8.8/userguide/command_line_interface.html#sec:command_line_warnings in the Gradle documentation.

BUILD SUCCESSFUL in 2m 54s
61 actionable tasks: 16 executed, 45 up-to-date
Smoke tests passed

https://github.com/dlvenable/data-prepper/actions/runs/16525916962/job/46741310344

dlvenable added 2 commits July 25, 2025 11:57
@dlvenable
Correct script by adding back set -e to return error codes.
4797aee 
Signed-off-by: David Venable <dlv@amazon.com>
@dlvenable
Support validating tar files by skipping the Docker pull if the image…
838e678 
… is local. Skip the Docker validations in the run-smoke-tests.sh script altogether to rely on the e2e-tests. Increase validation time to 30 minutes.

Signed-off-by: David Venable <dlv@amazon.com>
@dlvenable
Copy link
Copy Markdown
Member Author

dlvenable commented Jul 25, 2025

Updated run from the latest code:

https://github.com/dlvenable/data-prepper/actions/runs/16529901217

5903

@dlvenable
Copy link
Copy Markdown
Member Author

dlvenable commented Jul 26, 2025

Since the PR was first published I made a few observations and fixes.

  • The validate-archive jobs were succeeding in GitHub, but the logs showed failures. I fixed this by adding back the set -e to the Docker script. I tested with a local build that did fail and reported it as a failure.
  • The archives were failing due to the e2e-tests always trying to pull, even for local images. I fixed this by only pulling it if looks like a repository as determined by a / in the image name.
  • The validate-archives job was timing out and I noticed the validate-docker took over 9 minutes, so I increased this timeout to 30 to match the validate-docker. Now that they pass, they have taken around 10 minutes.

@dlvenable dlvenable merged commit c6f072a into opensearch-project:main Jul 28, 2025
48 of 49 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 28, 2025
@dlvenable @github-actions
Updated the smoke tests scripts to use the end-to-end tests (#5903)
964f007 
Updated the smoke tests scripts to use the end-to-end tests to get them running as part of the release again. Support validating tar files by skipping the Docker pull if the image is local. Skip the Docker validations in the run-smoke-tests.sh script altogether to rely on the e2e-tests. Increase validation time to 30 minutes.

Signed-off-by: David Venable <dlv@amazon.com>
(cherry picked from commit c6f072a)
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jul 28, 2025
Merged
@dlvenable dlvenable mentioned this pull request Jul 29, 2025
Merged
4 tasks
dlvenable added a commit that referenced this pull request Jul 29, 2025
@opensearch-trigger-bot @dlvenable
Updated the smoke tests scripts to use the end-to-end tests (#5903) (#…
8345a8e 
…5913)

Updated the smoke tests scripts to use the end-to-end tests to get them running as part of the release again. Support validating tar files by skipping the Docker pull if the image is local. Skip the Docker validations in the run-smoke-tests.sh script altogether to rely on the e2e-tests. Increase validation time to 30 minutes.


(cherry picked from commit c6f072a)

Signed-off-by: David Venable <dlv@amazon.com>
Co-authored-by: David Venable <dlv@amazon.com>
@dlvenable dlvenable deleted the 3568-e2e-smoke-tests branch July 31, 2025 15:47
@dlvenable dlvenable mentioned this pull request Sep 15, 2025
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oeyh oeyh oeyh approved these changes

@sb2k16 sb2k16 sb2k16 approved these changes

@chenqi0805 chenqi0805 Awaiting requested review from chenqi0805

@engechas engechas Awaiting requested review from engechas engechas is a code owner

@san81 san81 Awaiting requested review from san81 san81 is a code owner

@srikanthjg srikanthjg Awaiting requested review from srikanthjg srikanthjg is a code owner

@graytaylor0 graytaylor0 Awaiting requested review from graytaylor0 graytaylor0 is a code owner

@dinujoh dinujoh Awaiting requested review from dinujoh dinujoh is a code owner

@kkondaka kkondaka Awaiting requested review from kkondaka kkondaka is a code owner

@KarstenSchnitter KarstenSchnitter Awaiting requested review from KarstenSchnitter KarstenSchnitter is a code owner

Assignees

No one assigned

Labels

backport 2.12

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Update release workflow to use end-to-end tests with pre-released Docker image

3 participants

@dlvenable @oeyh @sb2k16