config: refactor workflow engine image vars

Signed-off-by: Dinos Kousidis <dinos.kousidis@cern.ch>
reanahub · Feb 14, 2019 · 493583a · 493583a
1 parent 193088c
commit 493583a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/reana_workflow_controller/config.py b/reana_workflow_controller/config.py
@@ -64,16 +64,19 @@
 }
 """Mapping from the shared file system backend to the job file system."""
 
-CWL_WORKFLOW_ENGINE_VERSION = os.getenv('CWL_WORKFLOW_ENGINE_VERSION',
-                                        'latest')
+REANA_WORKFLOW_ENGINE_IMAGE_CWL = os.getenv(
+     'REANA_WORKFLOW_ENGINE_IMAGE_CWL',
+     'reanahub/reana-workflow-engine-cwl:latest')
 """CWL workflow engine version."""
 
-YADAGE_WORKFLOW_ENGINE_VERSION = os.getenv('YADAGE_WORKFLOW_ENGINE_VERSION',
-                                           'latest')
+REANA_WORKFLOW_ENGINE_IMAGE_YADAGE = os.getenv(
+     'REANA_WORKFLOW_ENGINE_IMAGE_YADAGE',
+     'reanahub/reana-workflow-engine-yadage:latest')
 """Yadage workflow engine version."""
 
-SERIAL_WORKFLOW_ENGINE_VERSION = os.getenv('SERIAL_WORKFLOW_ENGINE_VERSION',
-                                           'latest')
+REANA_WORKFLOW_ENGINE_IMAGE_SERIAL = os.getenv(
+     'REANA_WORKFLOW_ENGINE_IMAGE_SERIAL',
+     'reanahub/reana-workflow-engine-serial:latest')
 """Serial workflow engine version."""
 
 WORKFLOW_ENGINE_COMMON_ENV_VARS = [

diff --git a/reana_workflow_controller/workflow_run_manager.py b/reana_workflow_controller/workflow_run_manager.py
@@ -20,16 +20,16 @@
                                           current_k8s_extensions_v1beta1)
 from reana_workflow_controller.errors import REANAInteractiveSessionError
 from reana_workflow_controller.config import (
-    CWL_WORKFLOW_ENGINE_VERSION,
     K8S_INTERACTIVE_DEPLOYMENT_TEMPLATE_PATH,
     MANILA_CEPHFS_PVC,
     REANA_STORAGE_BACKEND,
-    SERIAL_WORKFLOW_ENGINE_VERSION,
+    REANA_WORKFLOW_ENGINE_IMAGE_CWL,
+    REANA_WORKFLOW_ENGINE_IMAGE_SERIAL,
+    REANA_WORKFLOW_ENGINE_IMAGE_YADAGE,
     SHARED_FS_MAPPING,
     TTL_SECONDS_AFTER_FINISHED,
     WORKFLOW_ENGINE_COMMON_ENV_VARS,
     WORKFLOW_ENGINE_COMMON_ENV_VARS_DEBUG,
-    YADAGE_WORKFLOW_ENGINE_VERSION,
     DEFAULT_INTERACTIVE_SESSION_IMAGE,
     DEFAULT_INTERACTIVE_SESSION_PORT)
 
@@ -42,25 +42,25 @@ class WorkflowRunManager():
             WORKFLOW_ENGINE_COMMON_ENV_VARS_DEBUG)
 
     engine_mapping = {
-        'cwl': {'image': 'dinossimpson/reana-workflow-engine-cwl:{}'.
-                         format(CWL_WORKFLOW_ENGINE_VERSION),
+        'cwl': {'image': '{}'.
+                         format(REANA_WORKFLOW_ENGINE_IMAGE_CWL),
                 'command': ("run-cwl-workflow "
                             "--workflow-uuid {id} "
                             "--workflow-workspace {workspace} "
                             "--workflow-json '{workflow_json}' "
                             "--workflow-parameters '{parameters}' "
                             "--operational-options '{options}' "),
                 'environment_variables': WORKFLOW_ENGINE_COMMON_ENV_VARS},
-        'yadage': {'image': 'dinossimpson/reana-workflow-engine-yadage:{}'.
-                            format(YADAGE_WORKFLOW_ENGINE_VERSION),
+        'yadage': {'image': '{}'.
+                            format(REANA_WORKFLOW_ENGINE_IMAGE_YADAGE),
                    'command': ("run-yadage-workflow "
                                "--workflow-uuid {id} "
                                "--workflow-workspace {workspace} "
                                "--workflow-json '{workflow_json}' "
                                "--workflow-parameters '{parameters}' "),
                    'environment_variables': WORKFLOW_ENGINE_COMMON_ENV_VARS},
-        'serial': {'image': 'dinossimpson/reana-workflow-engine-serial:{}'.
-                            format(SERIAL_WORKFLOW_ENGINE_VERSION),
+        'serial': {'image': '{}'.
+                            format(REANA_WORKFLOW_ENGINE_IMAGE_SERIAL),
                    'command': ("run-serial-workflow "
                                "--workflow-uuid {id} "
                                "--workflow-workspace {workspace} "