Skip to content

Commit 178d585

Browse files
authored
Merge branch 'main' into several_detectors
2 parents f6422dc + c91f913 commit 178d585

36 files changed

+1427
-1587
lines changed

.coderabbit.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ reviews:
77
request_changes_workflow: false
88
high_level_summary: true
99
high_level_summary_placeholder: '@coderabbitai summary'
10-
high_level_summary_in_walkthrough: true
10+
high_level_summary_in_walkthrough: false
1111
auto_title_placeholder: '@coderabbitai'
1212
auto_title_instructions: ''
1313
review_status: true
@@ -25,7 +25,7 @@ reviews:
2525
auto_assign_reviewers: false
2626
poem: false
2727
labeling_instructions: []
28-
path_filters: []
28+
path_filters: ["!.github/**"]
2929
path_instructions: []
3030
abort_on_close: true
3131
disable_cache: false

.github/CODEOWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,10 @@
99

1010
# Global rule:
1111
* @opendatahub-io/opendatahub-tests-contributors
12+
13+
# Test directory specific rules
14+
tests/model_explainability/ @adolfo-ab @sheltoncyril
15+
tests/model_registry/ @dbasunag @lugi0 @fege
16+
tests/model_serving/ @mwaykole @Raghul-M
17+
tests/rag/ @jgarciao @jiripetrlik
18+
tests/workbenches @jstourac @andyatmiami

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ default_language_version:
66

77
repos:
88
- repo: https://github.com/pre-commit/pre-commit-hooks
9-
rev: "v5.0.0"
9+
rev: "v6.0.0"
1010
hooks:
1111
- id: check-merge-conflict
1212
- id: debug-statements
@@ -36,7 +36,7 @@ repos:
3636
exclude: .*/__snapshots__/.*|.*-input\.json$
3737

3838
- repo: https://github.com/astral-sh/ruff-pre-commit
39-
rev: v0.12.7
39+
rev: v0.12.8
4040
hooks:
4141
- id: ruff
4242
- id: ruff-format

Dockerfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.13
1+
FROM fedora:42
22

33
ARG USER=odh
44
ARG HOME=/home/$USER
@@ -11,18 +11,17 @@ ENV UV_NO_CACHE=1
1111
ENV BIN_DIR="$HOME_DIR/.local/bin"
1212
ENV PATH="$PATH:$BIN_DIR"
1313

14-
RUN apt-get update \
15-
&& apt-get install -y ssh gnupg software-properties-common curl gpg wget vim apache2-utils rsync\
16-
&& apt-get clean autoclean \
17-
&& apt-get autoremove --yes \
18-
&& rm -rf /var/lib/{apt,dpkg,cache,log}/
14+
# Install Python 3.13 and other dependencies using dnf
15+
RUN dnf update -y \
16+
&& dnf install -y python3.13 python3.13-pip ssh gnupg curl gpg wget vim httpd-tools rsync openssl openssl-devel\
17+
&& dnf clean all \
18+
&& rm -rf /var/cache/dnf
1919

2020
# Install grpcurl
21-
RUN curl -sSL "https://github.com/fullstorydev/grpcurl/releases/download/v1.9.2/grpcurl_1.9.2_linux_x86_64.tar.gz" --output /tmp/grpcurl_1.2.tar.gz \
21+
RUN curl -sSL "https://github.com/fullstorydev/grpcurl/releases/download/v1.9.2/grpcurl_1.9.2_linux_x86_64.tar.gz" --output /tmp/grpcurl_1.2.tar.gz \
2222
&& tar xvf /tmp/grpcurl_1.2.tar.gz --no-same-owner \
2323
&& mv grpcurl /usr/bin/grpcurl
2424

25-
2625
RUN useradd -ms /bin/bash $USER
2726
USER $USER
2827
WORKDIR $HOME_DIR

docs/DEVELOPER_GUIDE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ The project utilizes [openshift-python-wrapper](https://github.com/RedHatQE/open
6666
Please refer to the [documentation](https://github.com/RedHatQE/openshift-python-wrapper/blob/main/README.md)
6767
and the [examples](https://github.com/RedHatQE/openshift-python-wrapper/tree/main/examples) for more information.
6868

69+
For any missing resources, please generate a new resource using
70+
[class_generator tool](https://github.com/RedHatQE/openshift-python-wrapper/blob/main/class_generator/README.md) and
71+
create a PR against wrapper. Calls to cluster resources from tests, utils and fixtures must always use
72+
openshift-python-wrapper resource or oc command
73+
(when wrapper resource is not relevant. e.g. must-gather generation)
74+
6975

7076
## Conftest
7177
- Top level [conftest.py](../conftest.py) contains pytest native fixtures.

renovate.json

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
":dependencyDashboard",
4+
"config:recommended",
5+
":dependencyDashboardApproval",
56
":maintainLockFilesWeekly",
67
":prHourlyLimitNone"
78
],
@@ -10,10 +11,29 @@
1011
"enabled": true
1112
},
1213
"baseBranches": ["main"],
14+
"recreateWhen": "never",
15+
"timezone": "America/New_York",
1316
"packageRules": [
1417
{
15-
"matchPackagePatterns": ["*"],
16-
"groupName": "python-dependencies"
17-
}
18+
"groupName": "Python dependencies (minor and patch)",
19+
"matchUpdateTypes": ["minor", "patch"],
20+
"matchFileNames": ["pyproject.toml"],
21+
"schedule": ["before 7am on monday"],
22+
"prPriority": 7
23+
},
24+
{
25+
"groupName": "Python dependencies (major)",
26+
"matchUpdateTypes": ["major"],
27+
"matchFileNames": ["pyproject.toml"],
28+
"schedule": ["after 7pm on thursday"],
29+
"prPriority": 10
30+
},
31+
{
32+
"groupName": "GitHub Actions",
33+
"matchManagers": ["github-actions"],
34+
"matchFileNames": [".github/workflows/**"],
35+
"schedule": ["before 6pm on wednesday"],
36+
"prPriority": 5
37+
}
1838
]
1939
}

tests/conftest.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -416,18 +416,6 @@ def dsc_resource(admin_client: DynamicClient) -> DataScienceCluster:
416416
return DataScienceCluster(client=admin_client, name=py_config["dsc_name"], ensure_exists=True)
417417

418418

419-
@pytest.fixture(scope="module")
420-
def updated_dsc_component_state(
421-
request: FixtureRequest,
422-
dsc_resource: DataScienceCluster,
423-
) -> Generator[DataScienceCluster, Any, Any]:
424-
with update_components_in_dsc(
425-
dsc=dsc_resource,
426-
components={request.param["component_name"]: request.param["desired_state"]},
427-
) as dsc:
428-
yield dsc
429-
430-
431419
@pytest.fixture(scope="package")
432420
def enabled_modelmesh_in_dsc(
433421
dsc_resource: DataScienceCluster,

0 commit comments

Comments
 (0)