add container_runtime from modak

SODALITE-EU · Aug 31, 2020 · c32615a · c32615a
1 parent a8854c6
commit c32615a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 25 deletions.
diff --git a/use-cases/clinical-uc/egi-hlrs-modak/service.yml b/use-cases/clinical-uc/egi-hlrs-modak/service.yml
@@ -49,26 +49,6 @@ topology_template:
       properties:
         endpoint: { get_input: modak-endpoint }
 
-### image pulling
-    mpi-test-image-hlrs:
-      type: sodalite.image_puller.singularity
-      properties:
-        image: "ethcscs/mpich:ub1804_cuda101_mpi314_gnugprof"
-        registry: "docker"
-        images_location: /mnt/nfs/home/kamil/singularity_images
-      requirements:
-        - host: hlrs-torque
-
-    mpi-test-image-egi:
-      type: sodalite.image_puller.singularity
-      properties:
-        image: "pottava/openmpi:1.10"
-        registry: "docker"
-        images_location: /home/kamil/singularity_images
-      requirements:
-        - host: egi-torque
-
-
 ### modak job parameters for hlrs
     mpi-test-modak-job-hlrs:
       type: sodalite.nodes.modak.job
@@ -121,7 +101,7 @@ topology_template:
 
       requirements:
         - modak_endpoint: modak-instance
-        - dependency: mpi-test-image-hlrs
+
 
 ### modak job parameters for egi
     mpi-test-modak-job-egi:
@@ -174,7 +154,28 @@ topology_template:
 
       requirements:
         - modak_endpoint: modak-instance
-        - dependency: mpi-test-image-egi
+
+
+### image pulling
+    mpi-test-image-hlrs:
+      type: sodalite.image_puller.singularity
+      properties:
+        image: { get_attribute: [SELF, dependency, container_runtime] }
+        registry: "docker"
+        images_location: /mnt/nfs/home/kamil/singularity_images
+      requirements:
+        - host: hlrs-torque
+        - dependency: mpi-test-modak-job-hlrs
+
+    mpi-test-image-egi:
+      type: sodalite.image_puller.singularity
+      properties:
+        image: { get_attribute: [SELF, dependency, container_runtime] }
+        registry: "docker"
+        images_location: /home/kamil/singularity_images
+      requirements:
+        - host: egi-torque
+        - dependency: mpi-test-modak-job-egi
 
 ### job configs
     mpi-test-job-config-hlrs:
@@ -188,7 +189,7 @@ topology_template:
           SINGULARITY_DIR: /mnt/nfs/home/kamil/singularity_images
       requirements:
         - host: hlrs-torque
-        - dependency: mpi-test-modak-job-hlrs
+        - dependency: mpi-test-image-hlrs
 
     mpi-test-job-config-egi:
       type: sodalite.nodes.hpc.job.torque.preconfigured
@@ -201,7 +202,7 @@ topology_template:
           SINGULARITY_DIR: /home/kamil/singularity_images
       requirements:
         - host: egi-torque
-        - dependency: mpi-test-modak-job-egi
+        - dependency: mpi-test-image-egi
 
 ### job workflow
     mpi-test-job-hlrs:

diff --git a/use-cases/modules/hpc/image-puller/playbooks/start-puller.yml b/use-cases/modules/hpc/image-puller/playbooks/start-puller.yml
@@ -61,9 +61,11 @@
             singularity pull \
               --dir {{ images_location }} \
               {{ output }} \
-              {{ registry }}://{{ image }}
+              {{ image_path }}
           register: pull_status 
           ignore_errors: yes
+          vars:
+            image_path: "{{ image if image is search('(docker|library|shub)://') else registry + '://' + image }}"
 
         # ignoring only "Image file already exists" error
         - fail:

diff --git a/use-cases/modules/hpc/modak/job/main.yml b/use-cases/modules/hpc/modak/job/main.yml
@@ -47,6 +47,8 @@ node_types:
     attributes:
       artifact_url:
         type: string
+      container_runtime:
+        type: string
     requirements:
       - modak_endpoint:
           node: sodalite.nodes.modak

diff --git a/use-cases/modules/hpc/modak/job/playbooks/create-modak-job.yml b/use-cases/modules/hpc/modak/job/playbooks/create-modak-job.yml
@@ -36,10 +36,14 @@
     - set_fact:
         artifact_url: "{{ response.json.job.job_script }}"
 
+    - set_fact:
+        container_runtime: "{{ response.json.job.application.container_runtime if response.json.job.application.container_runtime is defined else '' }}"
+
     - name: Set artifact url
       set_stats:
         data:
           artifact_url: "{{ artifact_url }}"
+          container_runtime: "{{ container_runtime }}"
 
     - name: Save job
       get_url: