Skip to content

Commit 6d474e2

Browse files
committed
Remove duplicated e2e_*_smoke_release variants.
Added `e2e_*_smoke_release` to `git_tag_aliases`
1 parent 345fbdf commit 6d474e2

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
@@ -199,8 +199,8 @@ patch_aliases:
199199
variant_tags: [ "release_all_agents_manually" ]
200200
task: ".*"
201201
- alias: "release"
202-
variant_tags: [ "release" ]
203-
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets" ]
202+
variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
203+
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ]
204204
- alias: "smoke_test_release"
205205
variant_tags: [ "e2e_smoke_release_test_suite" ]
206206
task_tags: [ "patch-run" ]
@@ -230,8 +230,8 @@ github_checks_aliases:
230230
# Triggered on git tag
231231
git_tag_aliases:
232232
- git_tag: "^(\\d+\\.)?(\\d+\\.)?(\\d+)$"
233-
variant_tags: [ "release" ]
234-
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets" ]
233+
variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
234+
task_tags: [ "image_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ]
235235

236236
tasks:
237237
- name: unit_tests_golang
@@ -1366,9 +1366,10 @@ buildvariants:
13661366

13671367
- name: e2e_smoke
13681368
display_name: e2e_smoke
1369-
tags: [ "e2e_test_suite" ]
1369+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
13701370
run_on:
13711371
- ubuntu2204-large
1372+
allowed_requesters: [ "patch", "github_tag" ]
13721373
depends_on:
13731374
- name: build_test_image
13741375
variant: init_test_run
@@ -1377,30 +1378,7 @@ buildvariants:
13771378

13781379
- name: e2e_static_smoke
13791380
display_name: e2e_static_smoke
1380-
tags: [ "e2e_test_suite" ]
1381-
run_on:
1382-
- ubuntu2204-large
1383-
depends_on:
1384-
- name: build_test_image
1385-
variant: init_test_run
1386-
tasks:
1387-
- name: e2e_smoke_task_group
1388-
1389-
- name: e2e_smoke_release
1390-
display_name: e2e_smoke_release
1391-
tags: [ "e2e_smoke_release_test_suite" ]
1392-
run_on:
1393-
- ubuntu2204-large
1394-
allowed_requesters: [ "patch", "github_tag" ]
1395-
depends_on:
1396-
- name: build_test_image
1397-
variant: init_test_run
1398-
tasks:
1399-
- name: e2e_smoke_task_group
1400-
1401-
- name: e2e_static_smoke_release
1402-
display_name: e2e_static_smoke_release
1403-
tags: [ "e2e_smoke_release_test_suite" ]
1381+
tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
14041382
run_on:
14051383
- ubuntu2204-large
14061384
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)