Skip to content

Commit 411ad0d

Browse files
committed
fixes
1 parent 174f762 commit 411ad0d

File tree

3 files changed

+41
-15
lines changed

3 files changed

+41
-15
lines changed

.evergreen.yml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,9 @@ tasks:
298298
- func: quay_login
299299
- func: pipeline
300300
vars:
301-
BUILD_SCENARIO: release
302-
FLAGS: "--all-agents -r quay.io/mongodb/mongodb-agent --no-skip-if-exists"
301+
image_name: agent
302+
build_scenario: release
303+
flags: "--parallel --all-agents -r quay.io/mongodb/mongodb-agent --no-skip-if-exists"
303304

304305
- name: run_precommit_and_push
305306
tags: [ "patch-run" ]
@@ -370,7 +371,7 @@ tasks:
370371
vars:
371372
image_name: meko-tests-arm64
372373

373-
- name: build_test_image_ibm
374+
- name: build_test_image_ibm_z
374375
commands:
375376
- func: clone
376377
- func: setup_building_host_minikube
@@ -380,7 +381,7 @@ tasks:
380381
- func: download_multi_cluster_binary
381382
- func: pipeline
382383
vars:
383-
IMAGE_NAME: meko-tests-ibm-z
384+
image_name: meko-tests-ibm-z
384385

385386
- name: build_test_image_ibm_power
386387
commands:
@@ -392,7 +393,7 @@ tasks:
392393
- func: download_multi_cluster_binary
393394
- func: pipeline
394395
vars:
395-
IMAGE_NAME: meko-tests-ibm-power
396+
image_name: meko-tests-ibm-power
396397

397398
- name: build_mco_test_image
398399
commands:
@@ -1417,11 +1418,14 @@ buildvariants:
14171418

14181419
- name: e2e_smoke_ibm_power
14191420
display_name: e2e_smoke_ibm_power
1420-
tags: [ "staging", "e2e_smoke_multi_arch" ]
1421+
tags: [ "staging", "e2e_smoke_test_suite" ]
14211422
run_on:
14221423
- rhel9-power-small
14231424
- rhel9-power-large
14241425
allowed_requesters: [ "patch", "commit" ]
1426+
# TODO: Re-enable when staging is added to pipeline
1427+
# https://jira.mongodb.org/browse/CLOUDP-349096
1428+
disable: true
14251429
depends_on:
14261430
- name: build_operator_ubi
14271431
variant: init_test_run
@@ -1436,11 +1440,14 @@ buildvariants:
14361440

14371441
- name: e2e_static_smoke_ibm_power
14381442
display_name: e2e_static_smoke_ibm_power
1439-
tags: [ "staging", "e2e_smoke_multi_arch", "static" ]
1443+
tags: [ "staging", "e2e_smoke_test_suite", "static" ]
14401444
run_on:
14411445
- rhel9-power-small
14421446
- rhel9-power-large
14431447
allowed_requesters: [ "patch", "commit" ]
1448+
# TODO: Re-enable when staging is added to pipeline
1449+
# https://jira.mongodb.org/browse/CLOUDP-349096
1450+
disable: true
14441451
depends_on:
14451452
- name: build_operator_ubi
14461453
variant: init_test_run
@@ -1455,12 +1462,14 @@ buildvariants:
14551462

14561463
- name: e2e_smoke_ibm_z
14571464
display_name: e2e_smoke_ibm_z
1458-
tags: [ "staging", "e2e_smoke_multi_arch" ]
1459-
disable: true
1465+
tags: [ "staging", "e2e_smoke_test_suite" ]
14601466
run_on:
14611467
- rhel9-zseries-small
14621468
- rhel9-zseries-large
14631469
allowed_requesters: [ "patch", "commit" ]
1470+
# TODO: Re-enable when staging is added to pipeline
1471+
# https://jira.mongodb.org/browse/CLOUDP-349096
1472+
disable: true
14641473
depends_on:
14651474
- name: build_operator_ubi
14661475
variant: init_test_run
@@ -1475,7 +1484,9 @@ buildvariants:
14751484

14761485
- name: e2e_static_smoke_ibm_z
14771486
display_name: e2e_static_smoke_ibm_z
1478-
tags: [ "staging", "e2e_smoke_multi_arch", "static" ]
1487+
tags: [ "staging", "e2e_smoke_test_suite", "static" ]
1488+
# TODO: Re-enable when staging is added to pipeline
1489+
# https://jira.mongodb.org/browse/CLOUDP-349096
14791490
disable: true
14801491
run_on:
14811492
- rhel9-zseries-small
@@ -1493,7 +1504,7 @@ buildvariants:
14931504

14941505
- name: e2e_smoke_arm
14951506
display_name: e2e_smoke_arm
1496-
tags: [ "staging", "e2e_smoke_multi_arch"]
1507+
tags: [ "staging", "e2e_smoke_test_suite" ]
14971508
run_on:
14981509
- ubuntu2404-arm64-large
14991510
allowed_requesters: [ "patch", "commit" ]
@@ -1511,7 +1522,7 @@ buildvariants:
15111522

15121523
- name: e2e_static_smoke_arm
15131524
display_name: e2e_static_smoke_arm
1514-
tags: [ "staging", "e2e_smoke_multi_arch", "static" ]
1525+
tags: [ "staging", "e2e_smoke_test_suite", "static" ]
15151526
run_on:
15161527
- ubuntu2404-arm64-large
15171528
allowed_requesters: [ "patch", "commit" ]
@@ -1742,13 +1753,12 @@ buildvariants:
17421753
- name: build_kubectl_mongodb_plugin
17431754
variant: init_test_run
17441755
tasks:
1745-
- name: build_test_image_ibm_power
1756+
- name: init_test_run_ibm_power
17461757

17471758
- name: init_test_run_ibm_z
17481759
display_name: init_test_run_ibm_z
17491760
max_hosts: -1
17501761
tags: [ "staging" ]
1751-
disable: true
17521762
run_on:
17531763
- rhel9-zseries-small
17541764
- rhel9-zseries-large

scripts/release/argparse_utils.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
1+
import argparse
2+
13
from scripts.release.build.build_scenario import BuildScenario
24
from scripts.release.build.image_build_configuration import SUPPORTED_PLATFORMS
35

46

7+
def str2bool(v):
8+
if isinstance(v, bool):
9+
return v
10+
if v.lower() in ("yes", "true", "t", "y", "1"):
11+
return True
12+
elif v.lower() in ("no", "false", "f", "n", "0"):
13+
return False
14+
else:
15+
raise argparse.ArgumentTypeError("Boolean value expected.")
16+
17+
518
def get_scenario_from_arg(args_scenario: str) -> BuildScenario | None:
619
try:
720
return BuildScenario(args_scenario)

scripts/release/check_changelog.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
from git import Repo
55

6+
from scripts.release.argparse_utils import str2bool
67
from scripts.release.changelog import get_changelog_entries
78
from scripts.release.constants import DEFAULT_CHANGELOG_PATH, DEFAULT_REPOSITORY_PATH
89

@@ -43,7 +44,9 @@
4344
"--fail-if-no-changes",
4445
default=True,
4546
metavar="",
46-
action=argparse.BooleanOptionalAction,
47+
action="store",
48+
type=str2bool,
49+
nargs="?",
4750
help="Fail if no changelog entries are found. Default is True.",
4851
)
4952
args = parser.parse_args()

0 commit comments

Comments
 (0)