Merge pull request #14002 from AttilaVamos/HPCC-24414-impr-7.10.x

HPCC-24414 OriginalTextFilesIp should not default to EspIP

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

testing/regress/ecl-test

@@ -394,7 +394,7 @@ class RegressMain:
             self.args.setupExtraX = []
             self.args.setupExtraX.append('OriginalTextFilesOsPath='+self.regressionSuiteHpccMainOsDir)
             self.args.setupExtraX.append('OriginalTextFilesEclPath='+self.regressionSuiteHpccMainEclDir)
-            self.args.setupExtraX.append('OriginalTextFilesIp=' + self.config.espIp )
+            self.args.setupExtraX.append('OriginalTextFilesIp=' +self.config.setupExtraParams['OriginalTextFilesIp'] )
 
             self.args.setupExtraX.append('dropzoneIp=' + self.config.dropzoneIp )
             self.args.setupExtraX.append('dropzonePath=' + self.config.dropzonePath )

testing/regress/ecl-test-cluster160.json

@@ -61,7 +61,8 @@
             "disableLocalOptimizations"
         ],
         "setupExtraParams":{
-            "OriginalTextFilesOsPath" : "/opt/HPCCSystems/testing/regress"
+            "OriginalTextFilesOsPath" : "/opt/HPCCSystems/testing/regress",
+            "OriginalTextFilesIp" : "127.0.0.1"
         }
     }
 }

testing/regress/ecl-test.json

@@ -58,7 +58,8 @@
             "failOnLeaks"
         ],
         "setupExtraParams":{
-            "OriginalTextFilesOsPath" : "/opt/HPCCSystems/testing/regress"
+            "OriginalTextFilesOsPath" : "/opt/HPCCSystems/testing/regress",
+            "OriginalTextFilesIp" : "127.0.0.1"
         },
         "FileExclusion":[
             "*_blahblah.ecl"