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()}"

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: