Skip to content

Commit 38756e4

Browse files
committed
Add a test disablement group for anaconda PR (gh1397)
Allow to specify easily which tests should be disabled for runs from anaconda CI. The tests added here are those using locally generated boot.iso.
1 parent 3e165bd commit 38756e4

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

containers/runner/skip-testtypes

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ rhel8_daily_skip_array=(
7878
skip-on-rhel-8
7979
)
8080

81+
anaconda_pr_skip_array=(
82+
stage2-from-compose
83+
)
84+
8185
_join_args_by_comma(){
8286
local IFS=","
8387
echo "$*"
@@ -92,4 +96,4 @@ SKIP_TESTTYPES_RHEL9=$(_join_args_by_comma "${common_skip_array[@]}" "${rhel9_sk
9296
SKIP_TESTTYPES_RHEL10=$(_join_args_by_comma "${common_skip_array[@]}" "${rhel10_skip_array[@]}")
9397
SKIP_TESTTYPES_RHEL8_DAILY=$(_join_args_by_comma "${common_skip_array[@]}" "${rhel8_daily_skip_array[@]}")
9498
# Tests run on an anaconda pull request by comment
95-
SKIP_TESTTYPES_ANACONDA_PR=$(_join_args_by_comma "${common_skip_array[@]}")
99+
SKIP_TESTTYPES_ANACONDA_PR=$(_join_args_by_comma "${common_skip_array[@]}" "${anaconda_pr_skip_array[@]}")

scripts/generate-launch-args.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ def parse_args():
8888
help="do not skip any tests based on os variant or branch")
8989
_parser.add_argument("--skip-file", type=str, metavar="PATH",
9090
help="file containing data about disabled tests")
91+
_parser.add_argument("--anaconda-pr", "-p", action="store_true",
92+
help="skip tests not working on anaconda PR")
9193
return _parser.parse_args()
9294

9395

@@ -112,6 +114,9 @@ def parse_args():
112114
if not platform:
113115
raise ValueError("Platform for branch {} is not defined".format(args.branch))
114116

117+
if args.anaconda_pr:
118+
disabled_testtypes.extend(get_skip_testtypes(skip_file, "SKIP_TESTTYPES_ANACONDA_PR"))
119+
115120
if platform:
116121
platform_args = ["--platform", platform]
117122

0 commit comments

Comments
 (0)