From 4bb2c6a0e3e4fe415db8be547ac5749b5f4dafea Mon Sep 17 00:00:00 2001
From: Michal Kovarik <mkovarik@redhat.com>
Date: Mar 31 2020 13:42:03 +0000
Subject: Add links to openshift and jenkins master


Append description with openshift namespace link and jenkins master
link.
Enable safeHTTP for description on jenkins master.
Set retry for SCM.

---

diff --git a/roles/c3i/templates/build.Jenkinsfile b/roles/c3i/templates/build.Jenkinsfile
index 0ceae82..e0fe9cc 100644
--- a/roles/c3i/templates/build.Jenkinsfile
+++ b/roles/c3i/templates/build.Jenkinsfile
@@ -150,7 +150,7 @@ pipeline {
           if (env.PR_NO) {
             env.PIPELINE_ID = "c3i-{{ c3i_component }}-pr-${env.PR_NO}-git${env.GIT_COMMIT.take(8)}-${currentBuild.id}"
           } else {
-            env.PIPELINE_ID = "c3i-{{ c3i_component }}-${env.GIT_REPO_REF}-git${env.GIT_COMMIT.take(8)}-${currentBuild.id}"
+            env.PIPELINE_ID = "c3i-{{ c3i_component }}-git${env.GIT_COMMIT.take(8)}-${currentBuild.id}"
           }
           echo "Requesting new OpenShift project ${env.PIPELINE_ID}..."
           openshift.withCluster() {
@@ -162,6 +162,8 @@ pipeline {
               )
             }
           }
+          namespaceLink = """<a href="{{ c3i_ocp_host }}/console/project/${env.PIPELINE_ID}">Openshift</a>"""
+          currentBuild.description = "${currentBuild.description}<br/>${namespaceLink}"
         }
       }
       post {
diff --git a/setup/jcasc.yml b/setup/jcasc.yml
index e3108be..afb4cf1 100644
--- a/setup/jcasc.yml
+++ b/setup/jcasc.yml
@@ -1,3 +1,9 @@
+jenkins:
+  markupFormatter:
+    rawHtml:
+      disableSyntaxHighlighting: false
+  scmCheckoutRetryCount: 10
+
 unclassified:
   globalCIConfiguration:
     configs:
diff --git a/verification/c3i-role-verification.Jenkinsfile b/verification/c3i-role-verification.Jenkinsfile
index cf89019..2b70711 100644
--- a/verification/c3i-role-verification.Jenkinsfile
+++ b/verification/c3i-role-verification.Jenkinsfile
@@ -124,6 +124,8 @@ pipeline {
               )
             }
           }
+          namespaceLink = """<a href="https://paas.psi.redhat.com/console/project/${env.PIPELINE_ID}">Openshift</a>"""
+          currentBuild.description = "${currentBuild.description}<br/>${namespaceLink}"
         }
       }
       post {
@@ -159,6 +161,8 @@ pipeline {
                c3i.waitForPods(script: this, objs: [name: "jenkins"], num: 1)
             }
           }
+          jenkinsLink = """<a href="https://jenkins-${env.PIPELINE_ID}.cloud.paas.psi.redhat.com">Jenkins</a>"""
+          currentBuild.description = "${currentBuild.description}<br/>${jenkinsLink}"
         }
       }
     }