DEF-1652152 [Azure][FS][Parallel] Timeout field value has no effect

PSModule/AbstractLauncherTaskCmdlet.cs

@@ -1,7 +1,7 @@
 /*
  * MIT License https://github.com/MicroFocus/ADM-TFS-Extension/blob/master/LICENSE
  *
- * Copyright 2016-2024 Open Text
+ * Copyright 2016-2025 Open Text
  *
  * The only warranties for products and services of Open Text and its affiliates and licensors ("Open Text") are as may be set forth in the express warranty statements accompanying such products and services.
  * Nothing herein should be construed as constituting an additional warranty.
@@ -197,12 +197,12 @@ protected override void ProcessRecord()
                                         }
                                     }
                                 }
-                                if (runStatus != RunStatus.CANCELED && _rptPaths.Any() && _enableFailedTestsReport)
+                                if (runStatus != RunStatus.CANCELED && _rptPaths.Any())
                                 {
                                     //run junit report converter
                                     string outputFileReport = Path.Combine(resdir, JUNIT_REPORT_XML);
                                     RunConverter(converterPath, outputFileReport);
-                                    if (File.Exists(outputFileReport) && new FileInfo(outputFileReport).Length > 0 && nrOfTests[H.FAIL] > 0)
+                                    if (_enableFailedTestsReport && nrOfTests[H.FAIL] > 0 && File.Exists(outputFileReport) && new FileInfo(outputFileReport).Length > 0)
                                     {
                                         H.ReadReportFromXMLFile(outputFileReport, true, out IList<KeyValuePair<string, IList<ReportMetaData>>> failedSteps);
                                         H.CreateFailedStepsReport(failedSteps, resdir);

PSModule/InvokeAlmLabManagementTaskCmdlet.cs

@@ -245,7 +245,8 @@ private RunManager GetRunManager(string rptPath)
                 ServerUrl = ALMServerPath,
                 Duration = TimeslotDuration,
                 EntityId = ALMEntityId,
-                RunType = TestRunType
+                RunType = TestRunType,
+                EnvironmentConfigurationId = EnvironmentConfigurationID
             };
             var cred = new Credentials(IsSSO, IsSSO ? ClientID : ALMUserName, IsSSO ? ApiKeySecret : ALMPassword);
             bool isDebug = (ActionPreference)GetVariableValue("DebugPreference") != ActionPreference.SilentlyContinue;

PSModule/InvokeFSTaskCmdlet.cs

@@ -167,7 +167,7 @@ public override Dictionary<string, string> GetTaskProperties()
             LauncherParamsBuilder builder = new();
 
             builder.SetRunType(RunType.FileSystem);
-            builder.SetPerScenarioTimeOut(Timeout);
+            builder.SetFsTimeOut(Timeout);
 
             var tests = TestsPath.Split("\n".ToArray());
 

PSModule/LauncherParamsBuilder.cs

@@ -64,7 +64,7 @@ public class LauncherParamsBuilder
         private const string RUNTESTTYPE = "RunTestType";
         private const string ALMTESTSETS = "almTestSets";
         private const string ALMRUNHOST = "almRunHost";
-        private const string PERSCENARIOTIMEOUT = "PerScenarioTimeOut";
+        private const string FSTIMEOUT = "fsTimeout";
         private const string MOBILEHOSTADDRESS = "MobileHostAddress";
         private const string MOBILEUSERNAME = "MobileUserName";
         private const string MOBILEPASSWORD = "MobilePassword";
@@ -246,9 +246,9 @@ public void SetTest(int index, string test)
             SetParamValue($"Test{index}", test);
         }
 
-        public void SetPerScenarioTimeOut(string perScenarioTimeOut)
+        public void SetFsTimeOut(string fsTimeOut)
         {
-            SetParamValue(PERSCENARIOTIMEOUT, perScenarioTimeOut.IsNullOrWhiteSpace() ? C.MINUS_ONE : perScenarioTimeOut);
+            SetParamValue(FSTIMEOUT, fsTimeOut.IsNullOrWhiteSpace() ? C.MINUS_ONE : fsTimeOut);
         }
 
         public void SetDigitalLabSrvConfig(ServerConfigEx config)

PSModule/Properties/AssemblyInfo.cs

@@ -1,7 +1,7 @@
 /*
  * MIT License https://github.com/MicroFocus/ADM-TFS-Extension/blob/master/LICENSE
  *
- * Copyright 2016-2024 Open Text
+ * Copyright 2016-2025 Open Text
  *
  * The only warranties for products and services of Open Text and its affiliates and licensors ("Open Text") are as may be set forth in the express warranty statements accompanying such products and services.
  * Nothing herein should be construed as constituting an additional warranty.
@@ -20,7 +20,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("OpenText")]
 [assembly: AssemblyProduct("PSModule")]
-[assembly: AssemblyCopyright("Copyright 2016-2024 Open Text")]
+[assembly: AssemblyCopyright("Copyright 2016-2025 Open Text")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -42,5 +42,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2024.2.0.2")]
+[assembly: AssemblyVersion("2025.2.0.0")]
 //[assembly: AssemblyFileVersion("2.0.0.0")]

UFTBuildTask/AlmLabManagementTask/localTask.ps1

@@ -20,6 +20,7 @@ $varProject = Get-VstsInput -Name 'varProject' -Require
 $varRunType = Get-VstsInput -Name 'varRunType'
 $varDescription = Get-VstsInput -Name 'varDescription'
 $varTimeslotDuration = Get-VstsInput -Name 'varTimeslotDuration' -Require
+$varEnvironmentConfigurationID = Get-VstsInput -Name 'varEnvironmentConfigurationID'
 $varClientType = Get-VstsInput -Name 'varClientType'
 $varReportName = Get-VstsInput -Name 'varReportName'
 [string]$tsPattern = Get-VstsInput -Name 'tsPattern'

UFTBuildTask/ParallelRunnerTask/localTask.ps1

@@ -15,11 +15,11 @@ using namespace PSModule.UftMobile.SDK.Entity
 using namespace System.Collections.Generic
 
 param()
-$testPathInput = Get-VstsInput -Name 'testPathInput' -Require
-$timeOutIn = Get-VstsInput -Name 'timeOutIn'
+$testPathInput = (Get-VstsInput -Name 'testPathInput' -Require).Trim()
+$timeOutIn = (Get-VstsInput -Name 'timeOutIn').Trim()
 $uploadArtifact = Get-VstsInput -Name 'uploadArtifact' -Require
 $artifactType = Get-VstsInput -Name 'artifactType'
-$rptFileName = Get-VstsInput -Name 'reportFileName'
+$rptFileName = (Get-VstsInput -Name 'reportFileName').Trim()
 [bool]$enableFailedTestsRpt = Get-VstsInput -Name 'enableFailedTestsReport' -AsBool
 [string]$tsPattern = Get-VstsInput -Name 'tsPattern'
 

UFTBuildTask/ParallelRunnerTask/task.json

@@ -12,7 +12,7 @@
   "version": {
     "Major": 6,
     "Minor": 0,
-    "Patch": 0
+    "Patch": 1
   },
   "helpUrl": "https://admhelp.microfocus.com/uft/en/latest/UFT_Help/Content/UFT_Tools/Azure_DevOps_Extension/uft-azure-devops-run-local.htm",
   "demands": "UFT_LAUNCHER",