Skip to content

Commit e02d655

Browse files
authored
fix: add must gather mock option and remove software-properties-common (#546)
1 parent 90ab963 commit e02d655

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ENV BIN_DIR="$HOME_DIR/.local/bin"
1212
ENV PATH="$PATH:$BIN_DIR"
1313

1414
RUN apt-get update \
15-
&& apt-get install -y ssh gnupg software-properties-common curl gpg wget vim \
15+
&& apt-get install -y ssh gnupg curl gpg wget vim \
1616
&& apt-get clean autoclean \
1717
&& apt-get autoremove --yes \
1818
&& rm -rf /var/lib/{apt,dpkg,cache,log}/

conftest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def pytest_addoption(parser: Parser) -> None:
3333
runtime_group = parser.getgroup(name="Runtime details")
3434
upgrade_group = parser.getgroup(name="Upgrade options")
3535
platform_group = parser.getgroup(name="Platform")
36+
must_gather_group = parser.getgroup(name="MustGather")
3637

3738
# AWS config and credentials options
3839
aws_group.addoption(
@@ -112,6 +113,13 @@ def pytest_addoption(parser: Parser) -> None:
112113
help="RHOAI/ODH applications namespace",
113114
)
114115

116+
must_gather_group.addoption(
117+
"--collect-must-gather",
118+
help="Indicate if must-gather should be collected on failure.",
119+
action="store_true",
120+
default=False,
121+
)
122+
115123

116124
def pytest_cmdline_main(config: Any) -> None:
117125
config.option.basetemp = py_config["tmp_base_dir"] = f"{config.option.basetemp}-{shortuuid.uuid()}"

0 commit comments

Comments
 (0)