Merge pull request #255 from equinor/fix/azure_ci

Fix/azure ci

Author: l3abak

src/config.py

@@ -7,8 +7,10 @@ class Config:
     AUTH_ENABLED = bool(int(os.getenv("AUTH_ENABLED", "1")))
     DMSS_URL = os.getenv("DMSS_URL", "http://dmss:5000")
     DM_JOB_URL = os.getenv("DM_JOB_URL", "http://job-api:5000")
+    # for Azure Container Instance where global addresses of DMSS and DM_JOB are needed
+    GLOBAL_DMSS_URL = os.getenv("GLOBAL_DMSS_URL", "")
+    GLOBAL_DM_JOB_URL = os.getenv("GLOBAL_DM_JOB_URL", "")  # Azure stuff
 
-    # Azure stuff
     # Where to run jobs in Azure
     AZURE_JOB_SUBSCRIPTION = os.getenv("AZURE_JOB_SUBSCRIPTION")
     AZURE_JOB_RESOURCE_GROUP = os.getenv("AZURE_JOB_RESOURCE_GROUP", "common")

src/job_handler_plugins/azure_container_instances/__init__.py

@@ -28,6 +28,8 @@
 
 _SUPPORTED_TYPE = "dmss://WorkflowDS/Blueprints/AzureContainer"
 
+# Interface for Azure
+
 
 class JobHandler(JobHandlerInterface):
     """
@@ -64,14 +66,24 @@ def start(self) -> str:
         ]
 
         env_vars.append(EnvironmentVariable(name="DMSS_TOKEN", value=self.job.token))
-        env_vars.append(EnvironmentVariable(name="DMSS_URL", value=config.DMSS_URL))
+        env_vars.append(EnvironmentVariable(name="DMSS_URL", value=config.GLOBAL_DMSS_URL))
+        env_vars.append(EnvironmentVariable(name="DM_JOB_URL", value=config.GLOBAL_DM_JOB_URL))
         env_vars.append(EnvironmentVariable(name="JOB_DMSS_ID", value=self.job.dmss_id))
 
         # Parse env-vars from job entity
         print("*****  Injecting env vars from job entity *****")
         for env_string in self.job.runner.get("environmentVariables", []):
-            key = env_string
-            env_vars.append(EnvironmentVariable(name=key, value=os.getenv(env_string)))
+            if "=" in env_string:
+                key, value = env_string.split("=", 1)
+            else:
+                key = env_string
+                if key not in os.environ:
+                    logger.warning(
+                        f"Environment variable '{key}' specified in job runner but not found in environment. Skipping."
+                    )
+                    continue
+                value = os.getenv(key)
+            env_vars.append(EnvironmentVariable(name=key, value=value))
 
         reference_target: str = self.job.referenceTarget
         runner_entity: dict = self.job.runner