[ISV-1429] Enhance Operator pipeline logs

Author: wcheang

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-ci-pipeline.yml

@@ -484,6 +484,8 @@ spec:
         - name: pyxis_url
           value: "$(tasks.set-env.results.pyxis_url)"
         - name: pipeline_name
+          value: "$(context.pipeline.name)"
+        - name: pipelinerun_name
           value: "$(context.pipelineRun.name)"
         - name: pyxis_api_key_secret_name
           value: "$(params.pyxis_api_key_secret_name)"

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-hosted-pipeline.yml

@@ -893,11 +893,15 @@ spec:
           value: "$(tasks.certification-project-check.results.certification_project_id)"
         - name: bundle_version
           value: "$(tasks.validate-pr-title.results.bundle_version)"
+        - name: git_pr_url
+          value: $(params.git_pr_url)
         - name: package_name
           value: "$(tasks.validate-pr-title.results.operator_name)"
         - name: pyxis_url
           value: "$(tasks.set-env.results.pyxis_url)"
         - name: pipeline_name
+          value: "$(context.pipeline.name)"
+        - name: pipelinerun_name
           value: "$(context.pipelineRun.name)"
         - name: pyxis_ssl_secret_name
           value: "$(params.pyxis_ssl_secret_name)"

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-release-pipeline.yml

@@ -527,11 +527,15 @@ spec:
           value: "$(tasks.certification-project-check.results.certification_project_id)"
         - name: bundle_version
           value: "$(tasks.bundle-path-validation.results.bundle_version)"
+        - name: git_pr_url
+          value: $(params.git_pr_url)
         - name: package_name
           value: "$(tasks.bundle-path-validation.results.package_name)"
         - name: pyxis_url
           value: "$(tasks.set-env.results.pyxis_url)"
         - name: pipeline_name
+          value: "$(context.pipeline.name)"
+        - name: pipelinerun_name
           value: "$(context.pipelineRun.name)"
         - name: pyxis_ssl_secret_name
           value: "$(params.pyxis_ssl_secret_name)"

ansible/roles/operator-pipeline/templates/openshift/tasks/upload-pipeline-logs.yml

@@ -33,7 +33,12 @@ spec:
     - name: package_name
       description: Operator package name
     - name: pipeline_name
+      description: Tekton pipeline name to identify which pipeline the logs are coming from
+    - name: pipelinerun_name
       description: Tekton pipeline run name where logs will be gathered from
+    - name: git_pr_url
+      description: URL to the pull request associated with the pipeline run
+      default: ""
   results:
     - name: pipeline_log_url
   workspaces:
@@ -52,7 +57,7 @@ spec:
 
         echo "Getting pipeline logs"
 
-        tkn pipelinerun logs "$(params.pipeline_name)" > $(workspaces.source.path)/pipeline.logs
+        tkn pipelinerun logs "$(params.pipelinerun_name)" > $(workspaces.source.path)/$(params.pipeline_name).log
 
     - name: upload-pipeline-logs
       image: "$(params.pipeline_image)"
@@ -81,8 +86,9 @@ spec:
           --operator-version "$(params.bundle_version)" \
           --operator-package-name "$(params.package_name)" \
           --certification-hash "$(params.md5sum)" \
+          --pull-request-url "$(params.git_pr_url)" \
           --pyxis-url "$(params.pyxis_url)" \
-          --path $(workspaces.source.path)/pipeline.logs \
+          --path $(workspaces.source.path)/$(params.pipeline_name).log \
           --type pipeline-logs \
           --output pipeline-logs-artifact.json \
           --verbose

operator-pipeline-images/operatorcert/entrypoints/upload_artifacts.py

@@ -38,6 +38,10 @@ def setup_argparser() -> Any:  # pragma: no cover
     )
     parser.add_argument("--operator-version", help="Operator version", required=True)
     parser.add_argument("--path", help="Path to artifact", required=True)
+    parser.add_argument(
+        "--pull-request-url",
+        help="URL to the pull request associated with the cert project.",
+    )
     parser.add_argument(
         "--type",
         choices=[
@@ -113,6 +117,8 @@ def upload_artifact(args: Any, file_path: str, org_id: Any = None) -> Dict[str,
     }
     if org_id:
         artifact_payload["org_id"] = org_id
+    if args.pull_request_url:
+        artifact_payload["pull_request_url"] = args.pull_request_url
     return pyxis.post(upload_url, artifact_payload)
 
 

operator-pipeline-images/tests/entrypoints/test_upload_artifacts.py

@@ -23,6 +23,7 @@ def test_upload_artifact(mock_post: MagicMock, mock_b64) -> None:
     args.operator_package_name = "foo"
     args.operator_version = "1.0"
     args.cert_project_id = "123123"
+    args.pull_request_url = "http://bar.com/"
 
     mock_b64.return_value = b"a"
     filename = "operator-pipeline-images/tests/data/preflight.log"
@@ -39,6 +40,7 @@ def test_upload_artifact(mock_post: MagicMock, mock_b64) -> None:
             "operator_package_name": args.operator_package_name,
             "version": args.operator_version,
             "org_id": 1,
+            "pull_request_url": args.pull_request_url,
         },
     )