Merge branch 'main' into dependabot/uv/pyopenssl-26.0.0

Author: dbasunag

.github/workflows/scripts/pr_workflow.py

@@ -109,7 +109,7 @@ def verify_allowed_user(self) -> bool:
             # check if the user is a member of opendatahub-tests-contributors
             membership = team.get_team_membership(member=self.user_login)
             LOGGER.info(f"User {self.user_login} is a member of the test contributor team. {membership}")
-            return True  # noqa: TRY300
+            return True
         except UnknownObjectException:
             LOGGER.error(f"User {self.user_login} is not allowed for this action. Exiting.")
             return False

.pre-commit-config.yaml

@@ -36,7 +36,7 @@ repos:
         exclude: .*/__snapshots__/.*|.*-input\.json$|^semgrep\.yaml$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.5
+    rev: v0.15.6
     hooks:
       - id: ruff
       - id: ruff-format
@@ -50,7 +50,7 @@ repos:
   #     - id: renovate-config-validator
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.30.0
+    rev: v8.30.1
     hooks:
       - id: gitleaks
 

Dockerfile

@@ -13,7 +13,7 @@ ENV PATH="$PATH:$BIN_DIR"
 
 # Install system dependencies using dnf
 RUN dnf update -y \
-    && dnf install -y python3 python3-pip ssh gnupg curl gpg wget vim httpd-tools rsync openssl openssl-devel\
+    && dnf install -y python3 python3-pip ssh gnupg curl gpg wget vim httpd-tools rsync openssl openssl-devel skopeo\
     && dnf clean all \
     && rm -rf /var/cache/dnf
 
@@ -22,6 +22,10 @@ RUN curl -sSL "https://github.com/fullstorydev/grpcurl/releases/download/v1.9.2/
     && tar xvf /tmp/grpcurl_1.2.tar.gz --no-same-owner \
     && mv grpcurl /usr/bin/grpcurl
 
+# Install cosign
+RUN curl -sSL "https://github.com/sigstore/cosign/releases/download/v2.4.2/cosign-linux-amd64" --output /usr/bin/cosign \
+    && chmod +x /usr/bin/cosign
+
 RUN useradd -ms /bin/bash $USER
 USER $USER
 WORKDIR $HOME_DIR

OWNERS

@@ -3,8 +3,10 @@ approvers:
   - fege
   - jgarciao
   - lugi0
+  - mwaykole
 reviewers:
   - dbasunag
   - fege
   - jgarciao
   - lugi0
+  - mwaykole

docs/GETTING_STARTED.md

@@ -138,7 +138,7 @@ To run tests with admin client only, pass `--tc=use_unprivileged_client:False` t
 ### jira integration
 
 To skip running tests which have open bugs, [pytest_jira](https://github.com/rhevm-qe-automation/pytest_jira) plugin is used.
-To run tests with jira integration, you need to set `PYTEST_JIRA_URL` and `PYTEST_JIRA_TOKEN` environment variables.
+To run tests with jira integration, you need to set `PYTEST_JIRA_URL`, `PYTEST_JIRA_USERNAME` and `PYTEST_JIRA_PASSWORD` environment variables.
 To make a test with jira marker, add: `@pytest.mark.jira(jira_id="RHOAIENG-0000", run=False)` to the test.
 
 ### Running containerized tests

tests/conftest.py

@@ -167,7 +167,7 @@ def registry_pull_secret(pytestconfig: Config) -> list[str]:
     try:
         for secret in registry_pull_secret:
             base64.b64decode(s=secret, validate=True)
-        return registry_pull_secret  # noqa: TRY300
+        return registry_pull_secret
     except binascii.Error:
         raise ValueError("Registry pull secret is not a valid base64 encoded string")
 
@@ -253,7 +253,7 @@ def modelcar_yaml_config(pytestconfig: pytest.Config) -> dict[str, Any] | None:
             modelcar_yaml = yaml.safe_load(file)
             if not isinstance(modelcar_yaml, dict):
                 raise ValueError("modelcar.yaml should contain a dictionary.")  # noqa: TRY004
-            return modelcar_yaml  # noqa: TRY300
+            return modelcar_yaml
         except yaml.YAMLError as e:
             raise ValueError(f"Error parsing modelcar.yaml: {e}") from e
 

tests/llama_stack/safety/conftest.py

@@ -48,7 +48,7 @@ def guardrails_orchestrator_ssl_cert(guardrails_orchestrator_route: Route):
         with open(filepath, "w") as f:
             f.write("\n".join(cert_lines))
 
-        return filepath  # noqa: TRY300
+        return filepath
 
     except Exception as e:  # noqa: BLE001
         raise RuntimeError(f"Could not get certificate from {hostname}: {e}")

tests/llama_stack/utils.py

@@ -98,7 +98,7 @@ def wait_for_llama_stack_client_ready(client: LlamaStackClient) -> bool:
             f"vector_stores:{len(vector_stores.data)} "
             f"files:{len(files.data)})"
         )
-        return True  # noqa: TRY300
+        return True
 
     except (APIConnectionError, InternalServerError) as error:
         LOGGER.debug(f"Llama Stack server not ready yet: {error}")

tests/model_registry/mcp_servers/config/test_invalid_yaml.py

@@ -37,7 +37,8 @@
 )
 @pytest.mark.usefixtures("mcp_invalid_yaml_configmap_patch")
 class TestMCPServerInvalidYAML:
-    """RHOAIENG-51582: Tests for graceful handling of invalid YAML sources (TC-LOAD-007, TC-LOAD-008)."""
+    """
+    Tests for graceful handling of invalid YAML sources (TC-LOAD-007, TC-LOAD-008)."""
 
     def test_valid_servers_loaded_despite_invalid_source(
         self: Self,

tests/model_registry/mcp_servers/config/test_multi_source.py

@@ -13,7 +13,7 @@
 
 @pytest.mark.usefixtures("mcp_multi_source_configmap_patch")
 class TestMCPServerMultiSource:
-    """RHOAIENG-51582: Tests for loading MCP servers from multiple YAML sources (TC-LOAD-002)."""
+    """Tests for loading MCP servers from multiple YAML sources (TC-LOAD-002)."""
 
     def test_all_servers_from_multiple_sources_loaded(
         self: Self,