Skip to content

Commit b45fa08

Browse files
committed
Remove duplicated e2e_*_smoke_release variants.
Added `e2e_*_smoke_release` to `git_tag_aliases`
1 parent 3556346 commit b45fa08

File tree

2 files changed

+8
-30
lines changed

2 files changed

+8
-30
lines changed

.evergreen.yml

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ patch_aliases:
216216
variant_tags: [ "release_all_agents_manually" ]
217217
task: ".*"
218218
- alias: "release"
219-
variant_tags: [ "release" ]
220-
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets" ]
219+
variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
220+
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ]
221221
- alias: "smoke_test_release"
222222
variant_tags: [ "e2e_smoke_release_test_suite" ]
223223
task_tags: [ "patch-run" ]
@@ -247,8 +247,8 @@ github_checks_aliases:
247247
# Triggered on git tag
248248
git_tag_aliases:
249249
- git_tag: "^(\\d+\\.)?(\\d+\\.)?(\\d+)$"
250-
variant_tags: [ "release" ]
251-
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets" ]
250+
variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
251+
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ]
252252

253253
tasks:
254254
- name: unit_tests_golang
@@ -1389,9 +1389,10 @@ buildvariants:
13891389

13901390
- name: e2e_smoke
13911391
display_name: e2e_smoke
1392-
tags: [ "e2e_test_suite" ]
1392+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
13931393
run_on:
13941394
- ubuntu2204-large
1395+
allowed_requesters: [ "patch", "github_tag" ]
13951396
depends_on:
13961397
- name: build_test_image
13971398
variant: init_test_run
@@ -1400,30 +1401,7 @@ buildvariants:
14001401

14011402
- name: e2e_static_smoke
14021403
display_name: e2e_static_smoke
1403-
tags: [ "e2e_test_suite" ]
1404-
run_on:
1405-
- ubuntu2204-large
1406-
depends_on:
1407-
- name: build_test_image
1408-
variant: init_test_run
1409-
tasks:
1410-
- name: e2e_smoke_task_group
1411-
1412-
- name: e2e_smoke_release
1413-
display_name: e2e_smoke_release
1414-
tags: [ "e2e_smoke_release_test_suite" ]
1415-
run_on:
1416-
- ubuntu2204-large
1417-
allowed_requesters: [ "patch", "github_tag" ]
1418-
depends_on:
1419-
- name: build_test_image
1420-
variant: init_test_run
1421-
tasks:
1422-
- name: e2e_smoke_task_group
1423-
1424-
- name: e2e_static_smoke_release
1425-
display_name: e2e_static_smoke_release
1426-
tags: [ "e2e_smoke_release_test_suite" ]
1404+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
14271405
run_on:
14281406
- ubuntu2204-large
14291407
allowed_requesters: [ "patch", "github_tag" ]

scripts/dev/contexts/e2e_static_smoke

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ export INIT_OPS_MANAGER_VERSION
2828
DATABASE_VERSION="$(grep -o '"databaseImageVersion": "[^"]*' release.json | grep -o '[^"]*$')"
2929
export DATABASE_VERSION
3030
export MDB_DEFAULT_ARCHITECTURE=static
31-
# For static smoke tests we nned the previous MDB version to have a ubi9 binary
31+
# For static smoke tests we need the previous MDB version to have a ubi9 binary
3232
export CUSTOM_MDB_PREV_VERSION=6.0.5

0 commit comments

Comments
 (0)