more oda

make-functions.sh

@@ -109,7 +109,7 @@ function pull() {
 function build() {
     touch pip.conf
     export DOCKER_BUILDKIT=1
-    docker pull $IMAGE || ( nb2worker ./ --build --tag-image $IMAGE --job --from ${CC_BASE_IMAGE:?} --docker-run-prefix="mkdir -pv /home/oda; export HOME_OVERRRIDE=/home/oda; source /init.sh; " --docker-command='id; export HOME_OVERRRIDE=/tmp; mkdir -pv $HOME_OVERRRIDE; source /init.sh; source /etc/bashrc; nbrun /repo/'$SOURCE_NAME'.ipynb $@'; ls -ltr *cwl; ) 
+    docker pull $IMAGE || ( nb2worker ./ --build --tag-image $IMAGE --job --from ${CC_BASE_IMAGE:?} --docker-run-prefix="mkdir -pv /home/oda; export HOME_OVERRRIDE=/home/oda; source /init.sh; " --docker-command='id; export HOME_OVERRRIDE=/tmp; mkdir -pv $HOME_OVERRRIDE; source /init.sh; source /etc/bashrc; oda-kb-evaluate /repo/'$SOURCE_NAME'.ipynb $@'; ls -ltr *cwl; ) 
     touch job.cwl
 }
 
@@ -427,6 +427,7 @@ function submit-all-cases() {
 function configure-reana() {
     reana-client secrets-add --env MINIO_KEY=${MINIO_KEY:?this should be set}
     reana-client secrets-add --env MINIO_URL=${MINIO_URL:?this should be set}
+    reana-client secrets-add --env MINIO_USER=${USER}
     reana-client secrets-list
 }
 
@@ -435,8 +436,10 @@ function download-cwl() {
     echo -e "\033[33mwill download"
     curl -L --header "PRIVATE-TOKEN: $(cat ~/.gitlab-token)" \
          "https://gitlab.astro.unige.ch/api/v4/projects/integral%2Fcc-workflows%2Fcc-${SOURCE_NAME}/jobs/artifacts/master/download?job=build"  > artifacts.gz
-    unzip -o artifacts.gz job.cwl
-    echo -e "\033[32mfound job.cwl"
+    unzip -o artifacts.gz ${SOURCE_NAME}.cwl
+    cp -fv ${SOURCE_NAME}.cwl job.cwl
+    echo -e "\033[32mfound job.cwl:"
+    ls -l job.cwl
     set +e
 }
 
@@ -452,7 +455,7 @@ inputs:
     input: inputs.yaml
 workflow:
   type: cwl
-  file: crab.cwl
+  file: job.cwl
 outputs:
   files:
    - cwl/docker_outdir/cwl.output.json