Adds DM_INSTANCE_DIRECTORY to variables for decoding

Author: Alan Christie

jote/compose.py

@@ -9,7 +9,7 @@
 import subprocess
 from typing import Any, Dict, Optional, Tuple
 
-_INSTANCE_DIRECTORY: str = '.instance-88888888-8888-8888-8888-888888888888'
+INSTANCE_DIRECTORY: str = '.instance-88888888-8888-8888-8888-888888888888'
 
 _COMPOSE_CONTENT: str = """---
 version: '2.4'
@@ -118,7 +118,7 @@ def create(self) -> str:
         # Make the test directory...
         test_path = self.get_test_path()
         project_path: str = self.get_test_project_path()
-        inst_path: str = f'{project_path}/{_INSTANCE_DIRECTORY}'
+        inst_path: str = f'{project_path}/{INSTANCE_DIRECTORY}'
         if not os.path.exists(inst_path):
             os.makedirs(inst_path)
 
@@ -134,7 +134,7 @@ def create(self) -> str:
              'command': self._command,
              'project_directory': self._project_directory,
              'working_directory': self._working_directory,
-             'instance_directory': _INSTANCE_DIRECTORY}
+             'instance_directory': INSTANCE_DIRECTORY}
         compose_content: str = _COMPOSE_CONTENT.format(**variables)
         compose_path: str = f'{test_path}/docker-compose.yml'
         with open(compose_path, 'wt', encoding='UTF-8') as compose_file:

jote/jote.py

@@ -15,7 +15,7 @@
 
 from decoder import decoder
 
-from .compose import get_test_root
+from .compose import get_test_root, INSTANCE_DIRECTORY
 from .compose import Compose
 
 # Where can we expect to find Job definitions?
@@ -369,6 +369,11 @@ def _test(args: argparse.Namespace,
                 input_files.append(value)
 
         if test_status:
+
+            # Job variables must contain 'built-in' variables: -
+            # - DM_INSTANCE_DIRECTORY
+            job_variables['DM_INSTANCE_DIRECTORY'] = INSTANCE_DIRECTORY
+
             # Get the raw (encoded) command from the job definition...
             raw_command: str = job_definition.command
             # Decode it using our variables...