Merge branch '2.16' into upgrade_216

Author: dbasunag

.github/workflows/add-remove-labels.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Run add remove labels
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RHODS_CI_BOT_PAT }}
           GITHUB_PR_NUMBER: "${{ github.event.pull_request.number || github.event.issue.number }}"
           GITHUB_EVENT_ACTION: ${{ github.event.action }}
           GITHUB_EVENT_REVIEW_STATE: ${{ github.event.review.state }}

Dockerfile

@@ -12,7 +12,7 @@ ENV BIN_DIR="$HOME_DIR/.local/bin"
 ENV PATH="$PATH:$BIN_DIR"
 
 RUN apt-get update \
-    && apt-get install -y ssh gnupg software-properties-common curl gpg wget vim \
+    && apt-get install -y ssh gnupg curl gpg wget vim \
     && apt-get clean autoclean \
     && apt-get autoremove --yes \
     && rm -rf /var/lib/{apt,dpkg,cache,log}/

conftest.py

@@ -33,6 +33,7 @@ def pytest_addoption(parser: Parser) -> None:
     runtime_group = parser.getgroup(name="Runtime details")
     upgrade_group = parser.getgroup(name="Upgrade options")
     platform_group = parser.getgroup(name="Platform")
+    must_gather_group = parser.getgroup(name="MustGather")
 
     # AWS config and credentials options
     aws_group.addoption(
@@ -112,6 +113,13 @@ def pytest_addoption(parser: Parser) -> None:
         help="RHOAI/ODH applications namespace",
     )
 
+    must_gather_group.addoption(
+        "--collect-must-gather",
+        help="Indicate if must-gather should be collected on failure.",
+        action="store_true",
+        default=False,
+    )
+
 
 def pytest_cmdline_main(config: Any) -> None:
     config.option.basetemp = py_config["tmp_base_dir"] = f"{config.option.basetemp}-{shortuuid.uuid()}"

tests/model_registry/conftest.py

@@ -459,4 +459,4 @@ def model_registry_client(
         author="opendatahub-test",
         user_token=current_client_token,
         is_secure=False,
-    )
+    )

tests/model_registry/constants.py

@@ -15,4 +15,4 @@ class ModelRegistryEndpoints:
     Annotations.KubernetesIo.NAME: DB_RESOURCES_NAME,
     Annotations.KubernetesIo.INSTANCE: DB_RESOURCES_NAME,
     Annotations.KubernetesIo.PART_OF: DB_RESOURCES_NAME,
-}
+}

tests/model_registry/test_model_registry_creation.py

@@ -43,4 +43,4 @@ def test_registering_model(
         model = register_model(model_registry_client=model_registry_client)
         get_and_validate_registered_model(
             model_registry_client=model_registry_client, model_name=MODEL_NAME, registered_model=model
-        )
+        )

tests/model_registry/upgrade/test_model_registry_upgrade.py

@@ -28,4 +28,4 @@ def test_retrieving_model_post_upgrade(
         self: Self,
         model_registry_client: ModelRegistryClient,
     ):
-        model_registry_client.get_registered_model(name=MODEL_NAME)
+        model_registry_client.get_registered_model(name=MODEL_NAME)

tests/model_registry/utils.py

@@ -166,4 +166,4 @@ def get_and_validate_registered_model(
 
 
 class ModelRegistryV1Alpha1(ModelRegistry):
-    api_version = f"{ModelRegistry.ApiGroup.MODELREGISTRY_OPENDATAHUB_IO}/{ModelRegistry.ApiVersion.V1ALPHA1}"
+    api_version = f"{ModelRegistry.ApiGroup.MODELREGISTRY_OPENDATAHUB_IO}/{ModelRegistry.ApiVersion.V1ALPHA1}"

utilities/jira.py

@@ -52,7 +52,7 @@ def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:
         # Check if the operator version in ClusterServiceVersion is greater than the jira fix version
         jira_fix_versions: list[Version] = []
         for fix_version in jira_fields.fixVersions:
-            if _fix_version := re.search(r"\d.\d+.\d+", fix_version.name):
+            if _fix_version := re.search(r"\d+\.\d+(?:\.\d+)?", fix_version.name):
                 jira_fix_versions.append(Version(_fix_version.group()))
 
         if not jira_fix_versions: