Skip to content

Remove duplicated e2e_*_smoke_release variants. #110

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

Merged
merged 2 commits into from
May 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 7 additions & 29 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ patch_aliases:
variant_tags: [ "release_all_agents_manually" ]
task: ".*"
- alias: "release"
variant_tags: [ "release" ]
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets" ]
variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ]
- alias: "smoke_test_release"
variant_tags: [ "e2e_smoke_release_test_suite" ]
task_tags: [ "patch-run" ]
Expand Down Expand Up @@ -247,8 +247,8 @@ github_checks_aliases:
# Triggered on git tag
git_tag_aliases:
- git_tag: "^(\\d+\\.)?(\\d+\\.)?(\\d+)$"
variant_tags: [ "release" ]
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets" ]
variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
Copy link
Member

Choose a reason for hiding this comment

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

Is my understanding correct that the release can be started without depending on successful e2e tests?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

yes, e2e_smoke_release_test_suite variant is only depending on init_test_run and nothing will block other release tasks to run

task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ]
Copy link
Member

Choose a reason for hiding this comment

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

Why does this now include patch-run task tags?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

patch-run is required because e2e_smoke_release_test_suite variant has tasks with that tag. It will only add tasks matching variant e2e_smoke_release_test_suite and not all e2e tests


tasks:
- name: unit_tests_golang
Expand Down Expand Up @@ -1389,9 +1389,10 @@ buildvariants:

- name: e2e_smoke
display_name: e2e_smoke
tags: [ "e2e_test_suite" ]
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
run_on:
- ubuntu2204-large
allowed_requesters: [ "patch", "github_tag" ]
depends_on:
- name: build_test_image
variant: init_test_run
Expand All @@ -1400,30 +1401,7 @@ buildvariants:

- name: e2e_static_smoke
display_name: e2e_static_smoke
tags: [ "e2e_test_suite" ]
run_on:
- ubuntu2204-large
depends_on:
- name: build_test_image
variant: init_test_run
tasks:
- name: e2e_smoke_task_group

- name: e2e_smoke_release
display_name: e2e_smoke_release
tags: [ "e2e_smoke_release_test_suite" ]
run_on:
- ubuntu2204-large
allowed_requesters: [ "patch", "github_tag" ]
depends_on:
- name: build_test_image
variant: init_test_run
tasks:
- name: e2e_smoke_task_group

- name: e2e_static_smoke_release
display_name: e2e_static_smoke_release
tags: [ "e2e_smoke_release_test_suite" ]
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
run_on:
- ubuntu2204-large
allowed_requesters: [ "patch", "github_tag" ]
Expand Down
29 changes: 0 additions & 29 deletions scripts/dev/contexts/e2e_smoke_release

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/dev/contexts/e2e_static_smoke
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ export INIT_OPS_MANAGER_VERSION
DATABASE_VERSION="$(grep -o '"databaseImageVersion": "[^"]*' release.json | grep -o '[^"]*$')"
export DATABASE_VERSION
export MDB_DEFAULT_ARCHITECTURE=static
# For static smoke tests we nned the previous MDB version to have a ubi9 binary
# For static smoke tests we need the previous MDB version to have a ubi9 binary
export CUSTOM_MDB_PREV_VERSION=6.0.5
32 changes: 0 additions & 32 deletions scripts/dev/contexts/e2e_static_smoke_release

This file was deleted.