Merge branch 'main' into feature/branch-and-type-filtered-transitions

Author: ralphbean

.tekton/build-pipeline.yaml

@@ -80,6 +80,10 @@ spec:
     default: 'false'
     description: Enable cache proxy configuration
     type: string
+  - name: enable-package-registry-proxy
+    default: 'true'
+    description: Use the package registry proxy when prefetching dependencies
+    type: string
   results:
   - description: ''
     name: IMAGE_URL
@@ -103,7 +107,7 @@ spec:
       - name: name
         value: init
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-init:0.4@sha256:f2de909151c733da85c7c05de8ecf37c55079c219dcf8db906175ae11fca0142
+        value: quay.io/konflux-ci/tekton-catalog/task-init:0.4@sha256:b797dd453ddad669365de6de4649e3a9e37e77aa26eb9862ca079a36cbfe64a4
       - name: kind
         value: task
       resolver: bundles
@@ -124,7 +128,7 @@ spec:
       - name: name
         value: git-clone-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:f3f28a40fb7b4c8a5c1ec935df5576139bb6ba5b80f3531f42da2f1f2448a53b
+        value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:13d49df7dc9ae301627e45f95a236011422996152f1bea46cd60217b0f057407
       - name: kind
         value: task
       resolver: bundles
@@ -141,14 +145,16 @@ spec:
       value: $(params.output-image).prefetch
     - name: ociArtifactExpiresAfter
       value: $(params.image-expires-after)
+    - name: enable-package-registry-proxy
+      value: $(params.enable-package-registry-proxy)
     runAfter:
     - clone-repository
     taskRef:
       params:
       - name: name
         value: prefetch-dependencies-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:db8f7c0640f695d2beab7ff660630873ba921593f764a277cb0c65451bc14077
+        value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:1b209c0d93e52e418f3e6cd4b4fd915a84e4bd7f68e1cfd0d6446133540d7f43
       - name: kind
         value: task
       resolver: bundles
@@ -195,7 +201,7 @@ spec:
       - name: name
         value: buildah-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.9@sha256:4f177774f52d6ab28ceda38ae843d40fbcd6a32ae637637ae23cbb207e675185
+        value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.9@sha256:681d9f65a7f50cb260ee576ccab551e11d63c549f1e1ef3d201da3c112855bd6
       - name: kind
         value: task
       resolver: bundles
@@ -217,7 +223,7 @@ spec:
       - name: name
         value: build-image-index
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:b65a1e0961e0e768dda1f118bc5b5cab9c7ca7f4ed094e6a4352e66f82b9fa0b
+        value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:550afde50349e22ec11191ea0db9a49395ab46fef4e8317d820b6e946677ebeb
       - name: kind
         value: task
       resolver: bundles
@@ -238,7 +244,7 @@ spec:
       - name: name
         value: source-build-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:0201377594e6e0e9d304aa23b2363e4f47e02f3ebb6fe5a410480c1a17c9edfb
+        value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:0917cfc7772e82cb8e74743c2104f43bcf2596aceafe87eec6fce69a8cac5f06
       - name: kind
         value: task
       resolver: bundles
@@ -260,7 +266,7 @@ spec:
       - name: name
         value: deprecated-image-check
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:5ff16b7e6b4a8aa1adb352e74b9f831f77ff97bafd1b89ddb0038d63335f1a67
+        value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:57d1f556982115311f603dd9a728c52a7a1d092f022e1db4560da01eca9e5d17
       - name: kind
         value: task
       resolver: bundles
@@ -282,7 +288,7 @@ spec:
       - name: name
         value: clair-scan
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:89924756c91ded746cf9ccc9f07907595e5b2454ddda0219132913a4875a5f59
+        value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:cd49cdea7e5403a87c4774bd8ea10bc4e6aeb83841ff490cbe42b782779513a7
       - name: kind
         value: task
       resolver: bundles
@@ -302,7 +308,7 @@ spec:
       - name: name
         value: ecosystem-cert-preflight-checks
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:2d439dce35dc07bec38dcf450bcba949851686141a256d87eb6f42e5a217f6e2
+        value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:25dcef1d9270b2e03fe6710a733171f7c7208e341fc627dac3a579088f44af34
       - name: kind
         value: task
       resolver: bundles
@@ -328,7 +334,7 @@ spec:
       - name: name
         value: sast-snyk-check-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:2ad986f28d0b724dabcf76c4de649f058f0e66998c7d2f61b66de46533bdbcad
+        value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8f3ecbeaff579e41b8278f82d7fabac27845db17a8e687ea6c510c0c9aceabbb
       - name: kind
         value: task
       resolver: bundles
@@ -350,7 +356,7 @@ spec:
       - name: name
         value: clamav-scan
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:4b0f83cf961f0e8fd56089409d872adaca5791d9291c3584be0f6ee386e53f3a
+        value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:567cb66bd2e1f4b58b9d4d756f3317fc62479e0b40aa0de66094b1f12d296cfc
       - name: kind
         value: task
       resolver: bundles
@@ -402,7 +408,7 @@ spec:
       - name: name
         value: sast-unicode-check-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:0854d9261760b2dc8f092569739685a5ab0a5c620e9cb8c1b78fef9e2d077a29
+        value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:90efa582de7770d55102b74014a765cd16a25a56f2cf644b56a788c70c4dc749
       - name: kind
         value: task
       resolver: bundles
@@ -424,7 +430,7 @@ spec:
       - name: name
         value: apply-tags
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.3@sha256:de3722bac1bf5ae8a95319162ce7e23fb33a7e2b7c0ac91535549f31a75aac86
+        value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.3@sha256:a291081de7fb27f832c6fc3c4b078acf7e6162ca4c085db38b118ca87e8b5b66
       - name: kind
         value: task
       resolver: bundles
@@ -447,7 +453,7 @@ spec:
       - name: name
         value: push-dockerfile-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.3@sha256:aa0d54cdd04777562599195439186bb9ea28ced4529e9b860867611cca453a39
+        value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.3@sha256:7855471abfe87de080b914f2f3ca27c59e64f6448a7c2435e51435b764494c71
       - name: kind
         value: task
       resolver: bundles
@@ -464,7 +470,7 @@ spec:
       - name: name
         value: rpms-signature-scan
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65b14e54b86c3b8e7332b53ff8d2e574693fa1335f9720aec21d47e9d15686f0
+        value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1d807f6be3be2bd8bff76321e9599bbafce8196dcd9597eeffd9df65466682af
       - name: kind
         value: task
       resolver: bundles

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi10/ubi:10.1-1769662757@sha256:64b34b13c0dda61ed9b977bde8068eb0d350f4afb75142715e83be68373e4848
+FROM registry.access.redhat.com/ubi10/ubi:10.1-1777453274@sha256:ff3bc6edd7f424bbf18ab671ce60f96593101e64f2c1a56eb5008b6bc3473310
 
 ARG SYNC2JIRA_GIT_REPO=https://github.com/release-engineering/Sync2Jira.git
 ARG SYNC2JIRA_GIT_REF=main

Dockerfile.sync-page

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi10/ubi:10.1-1769662757@sha256:64b34b13c0dda61ed9b977bde8068eb0d350f4afb75142715e83be68373e4848
+FROM registry.access.redhat.com/ubi10/ubi:10.1-1777453274@sha256:ff3bc6edd7f424bbf18ab671ce60f96593101e64f2c1a56eb5008b6bc3473310
 
 ARG SYNC2JIRA_GIT_REPO=https://github.com/release-engineering/Sync2Jira.git
 ARG SYNC2JIRA_GIT_REF=main

sync2jira/downstream_issue.py

@@ -1547,6 +1547,33 @@ def sync_with_jira(issue, config):
         retry = True
 
 
+def convert_content(content: str) -> str:
+    """Convert GitHub Flavored Markdown to Jira format via pypandoc.
+
+    Falls back to disabling TeX math extensions if the initial conversion
+    fails (e.g. content misinterpreted as LaTeX).  Returns the original
+    content unchanged if both attempts fail.
+
+    :param str content: GitHub Flavored Markdown text
+    :returns: Jira-formatted text, or the original content on failure
+    :rtype: str
+    """
+    try:
+        content = pypandoc.convert_text(content, "jira", format="gfm")
+    except Exception as e:
+        log.warning("pypandoc conversion failed, retrying with TeX disabled: %s", e)
+        try:
+            sanitized = content.replace("\\", "\\\\").replace("$", "\\$")
+            content = pypandoc.convert_text(
+                sanitized,
+                "jira",
+                format="gfm-tex_math_dollars-tex_math_single_backslash",
+            )
+        except Exception as e2:
+            log.warning("pypandoc fallback also failed; using raw content: %s", e2)
+    return content
+
+
 def update_jira(client, config, issue):
     # Check the status of the JIRA client
     if not config["sync2jira"]["develop"] and not check_jira_status(client):
@@ -1559,7 +1586,7 @@ def update_jira(client, config, issue):
             and issue.content
             and "github_markdown" in issue.downstream["issue_updates"]
         ):
-            issue.content = pypandoc.convert_text(issue.content, "jira", format="gfm")
+            issue.content = convert_content(issue.content)
 
     # First, check to see if we have a matching issue using the new method.
     # If we do, then bail out.  No sync needed.

sync2jira/downstream_pr.py

@@ -24,7 +24,6 @@
 from jira import JIRAError
 from jira.client import Issue as JIRAIssue
 from jira.client import ResultList
-import pypandoc
 
 # Local Modules
 import sync2jira.downstream_issue as d_issue
@@ -322,7 +321,7 @@ def _create_jira_issue_from_pr(client, pr, config):
             and pr_content
             and "github_markdown" in pr.downstream["issue_updates"]
         ):
-            pr_content = pypandoc.convert_text(pr_content, "jira", format="gfm")
+            pr_content = d_issue.convert_content(pr_content)
 
     # Convert PR to Issue-like object for creation
     # PR and Issue share similar structure, but we need to adapt it

tests/test_downstream_issue.py

@@ -1110,6 +1110,49 @@ def test_sync_with_jira_no_matching(
         )
         mock_existing_jira_issue_legacy.assert_not_called()
 
+    @mock.patch(PATH + "pypandoc")
+    def test_convert_content(self, mock_pypandoc):
+        """convert_content(): normal success, TeX fallback, and double failure."""
+        # Case 1: Normal GFM conversion succeeds
+        mock_pypandoc.convert_text.return_value = "normal markdown"
+
+        result = d.convert_content("normal markdown")
+
+        mock_pypandoc.convert_text.assert_called_once_with(
+            "normal markdown", "jira", format="gfm"
+        )
+        self.assertEqual(result, "normal markdown")
+
+        # Case 2: First call fails (TeX error), fallback succeeds
+        mock_pypandoc.convert_text.reset_mock()
+        mock_pypandoc.convert_text.side_effect = [
+            RuntimeError("Error producing PDF"),
+            "fallback converted",
+        ]
+
+        result = d.convert_content("bad $tex")
+
+        self.assertEqual(mock_pypandoc.convert_text.call_count, 2)
+        first_call = mock_pypandoc.convert_text.call_args_list[0]
+        self.assertEqual(first_call[1]["format"], "gfm")
+
+        fallback_call = mock_pypandoc.convert_text.call_args_list[1]
+        self.assertEqual(
+            fallback_call[1]["format"],
+            "gfm-tex_math_dollars-tex_math_single_backslash",
+        )
+        self.assertEqual(fallback_call[0][0], "bad \\$tex")
+        self.assertEqual(result, "fallback converted")
+
+        # Case 3: Both calls fail, raw content preserved
+        mock_pypandoc.convert_text.reset_mock()
+        mock_pypandoc.convert_text.side_effect = RuntimeError("pandoc broken")
+
+        result = d.convert_content("raw content")
+
+        self.assertEqual(mock_pypandoc.convert_text.call_count, 2)
+        self.assertEqual(result, "raw content")
+
     @mock.patch(PATH + "_update_title")
     @mock.patch(PATH + "_update_description")
     @mock.patch(PATH + "_update_comments")