ISSUE: JENKINS-35165 Jenkins plugin cannot work with ALM over SSL

---- change the link according to the address
hpsa · Jun 2, 2016 · dbb600f · dbb600f
1 parent fc869cc
commit dbb600f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/HpToolsLauncher/Runners/AlmTestSetsRunner.cs b/HpToolsLauncher/Runners/AlmTestSetsRunner.cs
@@ -736,9 +736,13 @@ private void WriteTestRunSummary(ITSTest prevTest)
         private string GetTestRunLink(ITSTest prevTest, int runid)
         {
             bool oldQc = CheckIsOldQc();
+            bool useSSL = (m_qcServer.Contains("https://"));
+
             ITestSet set = prevTest.TestSet;
-            string testRunLink = "td://" + m_qcProject + "." + m_qcDomain + "." + m_qcServer.Replace("http://", "") + "/TestLabModule-000000003649890581?EntityType=IRun&EntityID=" + runid;
-            string testRunLinkQc10 = "td://" + m_qcProject + "." + m_qcDomain + "." + m_qcServer.Replace("http://", "") + "/Test%20Lab?Action=FindRun&TestSetID=" + set.ID + "&TestInstanceID=" + prevTest.ID + "&RunID=" + runid;
+            string testRunLink = useSSL ? ("tds://" + m_qcProject + "." + m_qcDomain + "." + m_qcServer.Replace("https://", "") + "/TestLabModule-000000003649890581?EntityType=IRun&EntityID=" + runid) 
+                : ("td://" + m_qcProject + "." + m_qcDomain + "." + m_qcServer.Replace("http://", "") + "/TestLabModule-000000003649890581?EntityType=IRun&EntityID=" + runid);
+            string testRunLinkQc10 = useSSL ? ("tds://" + m_qcProject + "." + m_qcDomain + "." + m_qcServer.Replace("https://", "") + "/Test%20Lab?Action=FindRun&TestSetID=" + set.ID + "&TestInstanceID=" + prevTest.ID + "&RunID=" + runid) 
+                : ("td://" + m_qcProject + "." + m_qcDomain + "." + m_qcServer.Replace("http://", "") + "/Test%20Lab?Action=FindRun&TestSetID=" + set.ID + "&TestInstanceID=" + prevTest.ID + "&RunID=" + runid);
             string linkStr = (oldQc ? testRunLinkQc10 : testRunLink);
             return linkStr;
         }

diff --git a/src/main/resources/HpToolsAborter.exe b/src/main/resources/HpToolsAborter.exe
diff --git a/src/main/resources/HpToolsLauncher.exe b/src/main/resources/HpToolsLauncher.exe
diff --git a/src/main/resources/LRAnalysisLauncher.exe b/src/main/resources/LRAnalysisLauncher.exe