Helics on AWS: running an arbitrary script to start helics in different ways

aws/build.gradle

@@ -103,7 +103,7 @@ task deploy(type: AWSLambdaInvokeTask) {
   "profiler_type": "${ext.getParameterValue('profiler_type')}",
   "command": "deploy",
   "run_grafana" : ${ext.getParameterValue('runGrafana') ?: false},
-  "cosimulation_shell_script" : ${ext.getParameterValue('cosimulationShellScript') ?: ""},
+  "cosimulation_shell_script": "${ext.getParameterValue('cosimulationShellScript')}",
   "run_jupyter" : ${ext.getParameterValue('runJupyter') ?: false},
   "jupyter_token" : "${ext.getParameterValue('jupyterToken') ?: UUID.randomUUID().toString()}",
   "is_spot" : ${ext.getParameterValue('isSpot') ?: false},

aws/src/main/python/beam_lambda/lambda_function.py

@@ -828,13 +828,21 @@ def get_mandatory_param(param_name):
     if run_grafana:
         selected_script = GRAFANA_RUN + selected_script
 
+    def fix_script_path(original_script_path):
+        fixed_path = original_script_path
+        for start_path in ['src/main/bash/','main/bash/', 'bash/']:
+            if original_script_path.startswith(start_path):
+                fixed_path = original_script_path[len(start_path):]
+
+        return f"/home/ubuntu/git/beam/src/main/bash/{fixed_path}"
+
     if cosimulation_shell_script:
-        for start_path in ['src/main/bash','main/bash', 'bash']:
-            if cosimulation_shell_script.startswith(start_path):
-                cosimulation_shell_script = cosimulation_shell_script[len(start_path):]
+        fixed_script_path = fix_script_path(cosimulation_shell_script)
+        selected_script = f'sudo chmod +x {fixed_script_path}; sudo {fixed_script_path}; {selected_script}'
 
-        full_path_to_cosimulation_script = f"/home/ubuntu/git/beam/src/main/bash/{cosimulation_shell_script}"
-        selected_script = f'sudo chmod +x {full_path_to_cosimulation_script}; sudo {full_path_to_cosimulation_script}; {selected_script}'
+    if end_script != END_SCRIPT_DEFAULT:
+        fixed_script_path = fix_script_path(end_script)
+        end_script = f'sudo chmod +x {fixed_script_path}; sudo {fixed_script_path}'
 
     params = configs
     if s3_publish:
@@ -851,9 +859,6 @@ def get_mandatory_param(param_name):
         selected_script = EXECUTE_SCRIPT
         params = ['"{args}"'.format(args=execute_args)]
 
-    if end_script != END_SCRIPT_DEFAULT:
-        end_script = '/home/ubuntu/git/beam/sec/main/bash/' + end_script
-
     txt = ''
 
     init_ec2(region)

gradle.deploy.properties

@@ -16,7 +16,7 @@ s3Backup=true
 
 # path to a shell script to start cosimulation, expected to be related to src/main/bash/
 # for example: helics/run_pydss_federate.sh or helics/run_site_power_controller.sh
-cosimulationShellScript=""
+cosimulationShellScript=
 
 # Run Jupyter Notebook together with BEAM
 runJupyter=false