HPCC-31390 Allow soaptext1.ecl to be deployed as a query to aks

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
hpcc-systems · Mar 14, 2024 · 11dee7f · 11dee7f
1 parent 4fb9733
commit 11dee7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/testing/regress/ecl-test-azure.json b/testing/regress/ecl-test-azure.json
@@ -58,7 +58,7 @@
             "roxiegzip.ecl:TargetIP=roxie",
             "roxiewhitespace.ecl:TargetIP=roxie",
             "roxiepipe.ecl:TargetIP=roxie",
-            "soaptext1.ecl:TargetIP=roxie"
+            "soaptext1.ecl:remoteRoxieService=roxie,remoteEspService=eclqueries"
         ],
         "engineParams":[
             "failOnLeaks",

diff --git a/testing/regress/ecl/soaptext1.ecl b/testing/regress/ecl/soaptext1.ecl
@@ -31,14 +31,18 @@
 import ^ as root;
 
 //Simplified configuration
-roxieIP := '.' : STORED('TargetIP');
-espIP :=  '.' : STORED('TargetIP');
+string roxieIP := '.' : STORED('remoteRoxieService');
+string espIP :=  '.' : STORED('remoteEspService');
+boolean defaultEncryptConnection :=     false : stored('encryptConnection');
+boolean defaultPersistConnection := false : stored('persistConnection');
+boolean defaultCallDirect := false : stored('callDirect');
+boolean defaultCallViaEsp := false : stored('callViaEsp');
 
 //Simplified call options - doesn't provide all combinations that should be tested eventually
-boolean encryptConnection := #IFDEFINED(root.encryptConnection, false);
-boolean persistConnection := #IFDEFINED(root.persistConnection, false);
-boolean callDirect := #IFDEFINED(root.callDirect, false);
-boolean callViaEsp := #IFDEFINED(root.callViaEsp, false);
+boolean encryptConnection := #IFDEFINED(root.encryptConnection, defaultEncryptConnection);
+boolean persistConnection := #IFDEFINED(root.persistConnection, defaultPersistConnection);
+boolean callDirect := #IFDEFINED(root.callDirect, defaultCallDirect);
+boolean callViaEsp := #IFDEFINED(root.callViaEsp, defaultCallViaEsp);
 
 //--- end of version configuration ---