Skip to content
Snippets Groups Projects
Commit 0f289056 authored by Gervaise Henry's avatar Gervaise Henry :cowboy:
Browse files

Fix CI unit uploadInputBag

parent 4495ee5b
Branches
Tags
2 merge requests!58Develop,!53Resolve "process_derivaUpload"
Pipeline #8421 failed with stages
in 1 minute and 33 seconds
...@@ -287,7 +287,7 @@ uploadInputBag: ...@@ -287,7 +287,7 @@ uploadInputBag:
- merge_requests - merge_requests
script: script:
- ln -sfn `readlink -e ./test_data/auth/credential.json` ./credential.json - ln -sfn `readlink -e ./test_data/auth/credential.json` ./credential.json
- hatrac=$(singularity run 'docker://gudmaprbk/deriva1.3:1.0.0' deriva-hatrac-cli --host dev.gudmap.org ls /hatrac/resources/rnaseq/pipeline/input_bag/ | grep -o TEST) - hatrac=$(singularity run 'docker://gudmaprbk/deriva1.3:1.0.0' deriva-hatrac-cli --host dev.gudmap.org ls /hatrac/resources/rnaseq/pipeline/input_bag/ | grep -o /TEST$)
- > - >
if [ -z "${hatrac}" ]; then if [ -z "${hatrac}" ]; then
singularity run 'docker://gudmaprbk/deriva1.3:1.0.0' deriva-hatrac-cli --host dev.gudmap.org mkdir /hatrac/resources/rnaseq/pipeline/input_bag/TEST singularity run 'docker://gudmaprbk/deriva1.3:1.0.0' deriva-hatrac-cli --host dev.gudmap.org mkdir /hatrac/resources/rnaseq/pipeline/input_bag/TEST
...@@ -301,7 +301,7 @@ uploadInputBag: ...@@ -301,7 +301,7 @@ uploadInputBag:
cookie=$(cat credential.json | grep -A 1 '\"dev.gudmap.org\": {' | grep -o '\"cookie\": \".*\"') cookie=$(cat credential.json | grep -A 1 '\"dev.gudmap.org\": {' | grep -o '\"cookie\": \".*\"')
cookie=${cookie:11:-1} cookie=${cookie:11:-1}
loc=$(singularity run 'docker://gudmaprbk/deriva1.3:1.0.0' deriva-hatrac-cli --host dev.gudmap.org put ./test.txt /hatrac/resources/rnaseq/pipeline/input_bag/TEST/test.txt) loc=$(singularity run 'docker://gudmaprbk/deriva1.3:1.0.0' deriva-hatrac-cli --host dev.gudmap.org put ./test.txt /hatrac/resources/rnaseq/pipeline/input_bag/TEST/test.txt)
inputBag_rid=$(singularity run 'docker://gudmaprbk/deriva1.3:1.0.0' python3 uploadInputBag.py -f test.txt -l ${loc} -s ${md5} -b ${size} -o dev.gudmap.org -c ${cookie}) singularity run 'docker://gudmaprbk/deriva1.3:1.0.0' python3 uploadInputBag.py -f test.txt -l ${loc} -s ${md5} -b ${size} -o dev.gudmap.org -c ${cookie}
fi fi
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment