add support for ALM SSO (15)

jenkinsci · Aug 20, 2019 · 1e0ed46 · 1e0ed46
1 parent 13c5535
commit 1e0ed46
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 63 deletions.
diff --git a/HpToolsAborter/Program.cs b/HpToolsAborter/Program.cs
@@ -23,7 +23,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Management;
 using System.Diagnostics;
 using System.IO;

diff --git a/HpToolsLauncher/HpToolsLauncher.csproj b/HpToolsLauncher/HpToolsLauncher.csproj
@@ -59,7 +59,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="interop.OTAClient">
-      <HintPath>externals\interop.OTAClient.dll</HintPath>
+      <HintPath>..\..\..\interop.OTAClient.DLL</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.Wlrun, Version=11.52.0.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/HpToolsLauncher/HpToolsLauncherTests/UnitTest1.cs b/HpToolsLauncher/HpToolsLauncherTests/UnitTest1.cs
@@ -131,7 +131,7 @@ public void TestQcTestRun()
                 100000,
                 QcRunMode.RUN_LOCAL,
                 null,
-                new List<string> { "Aaron\\Amit" }, false, "", new List<string> { "Failed", "Blocked" }, false, TestStorageType.Alm, false);
+                new List<string> { "Aaron\\Amit" }, false, "", new List<string> { "Failed", "Blocked" }, false, TestStorageType.Alm, false, "", "");
 
             if (runner.Connected)
                 runner.Run();

diff --git a/HpToolsLauncher/Launcher.cs b/HpToolsLauncher/Launcher.cs
@@ -365,7 +365,7 @@ private IAssetRunner CreateRunner(TestStorageType runType, JavaProperties ciPara
                                      filterByStatuses,   
                                      initialTestRun,
                                      TestStorageType.AlmLabManagement,
-                                     isSSOEnabled);
+                                     isSSOEnabled, _ciParams["almClientID"], _ciParams["almApiKey"]);
                     break;
 
                 case TestStorageType.Alm:
@@ -447,7 +447,8 @@ private IAssetRunner CreateRunner(TestStorageType runType, JavaProperties ciPara
                                      filterByStatuses,
                                      initialTestRun,
                                      TestStorageType.Alm,
-                                     isSSOEnabled);
+                                     isSSOEnabled,
+                                     _ciParams["almClientID"], _ciParams["almApiKey"]);
                     break;
                 case TestStorageType.FileSystem:
                     bool displayController = false;