diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a60c64384aadb5de50677736fb18f6866f52d34..213da881fe1e3cf9419aad1db990d091d0202e43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ getData: script: - singularity run 'docker://bicf/gudmaprbkfilexfer:2.0.1_indev' bdbag --version > version_bdbag.txt - ln -sfn `readlink -e ./test_data/auth/cookies.txt` ~/.bdbag/deriva-cookies.txt - - unzip ./test_data/bag/Replicate_Q-Y5F6.zip + - unzip ./test_data/bag/staging/Replicate_Q-Y5F6.zip - singularity run 'docker://bicf/gudmaprbkfilexfer:2.0.1_indev' bash ./workflow/scripts/bdbagFetch.sh Replicate_Q-Y5F6 Replicate_Q-Y5F6 TEST - pytest -m getData artifacts: @@ -432,7 +432,7 @@ override_inputBag: script: - hostname - ulimit -a - - nextflow -q run ./workflow/rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5F6 --inputBagForce ./test_data/bag/Replicate_Q-Y5F6.zip --ci true + - nextflow -q run ./workflow/rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5F6 --inputBagForce ./test_data/bag/staging/Replicate_Q-Y5F6.zip --ci true - find . -type f -name "multiqc_data.json" -exec cp {} ./inputBagOverride_PE_multiqc_data.json \; artifacts: name: "$CI_JOB_NAME" diff --git a/workflow/rna-seq.nf b/workflow/rna-seq.nf index 97c25de77f9b95592e46f3ed92d0af7f98238807..04709a14369741efdafe5f4fbc0dbc7bb06a7627 100644 --- a/workflow/rna-seq.nf +++ b/workflow/rna-seq.nf @@ -12,7 +12,7 @@ params.deriva = "${baseDir}/../test_data/auth/credential.json" params.bdbag = "${baseDir}/../test_data/auth/cookies.txt" //params.repRID = "16-1ZX4" -params.repRID = "Q-Y5JA" +params.repRID = "Q-Y5F6" params.source = "dev" params.refMoVersion = "38.p6.vM22" params.refHuVersion = "38.p12.v31" @@ -164,7 +164,7 @@ process getBag { # deriva-download replicate RID echo -e "LOG: fetching bag for ${repRID} in GUDMAP" >> ${repRID}.getBag.log - deriva-download-cli ${source} --catalog 2 ${derivaConfig} . rid=${repRID} + deriva-download-cli staging.gudmap.org --catalog 2 ${derivaConfig} . rid=${repRID} echo -e "LOG: fetched" >> ${repRID}.getBag.log """ } @@ -716,6 +716,7 @@ spikeInfer.into{ speciesInfer.into { speciesInfer_getRef speciesInfer_aggrQC + speciesInfer_outputBag } @@ -1235,6 +1236,7 @@ process outputBag { input: path multiqc path multiqcJSON + val species from speciesInfer_outputBag output: path ("Replicate_*.zip") into outputBag @@ -1242,6 +1244,23 @@ process outputBag { script: """ mkdir Replicate_${repRID}.outputBag + echo -e "### Run Details" >> runDetails.md + echo -e "**Workflow URL:** https://git.biohpc.swmed.edu/gudmap_rbk/rna-seq" >> runDetails.md + echo -e "**Workflow Version:** ${workflow.manifest.version}" >> runDetails.md + echo -e "**Description:** ${workflow.manifest.description}" >> runDetails.md + if [ "${species}" == "Mus musculus" ]; then + genome=\$(echo GRCm${refMoVersion} | cut -d '.' -f1) + patch=\$(echo ${refMoVersion} | cut -d '.' -f2) + annotation=\$(echo ${refMoVersion} | cut -d '.' -f3 | tr -d 'v') + elif [ "${species}" == "Homo sapiens" ]; then + genome=\$(echo GRCh${refHuVersion} | cut -d '.' -f1) + patch=\$(echo ${refHuVersion} | cut -d '.' -f2) + annotation=\$(echo ${refHuVersion} | cut -d '.' -f3 | tr -d 'v') + fi + echo -e "**Genome Assembly Version:** \${genome} patch \${patch}" >> runDetails.md + echo -e "**Annotation Version:** GENCODE release \${annotation}" >> runDetails.md + echo -e "**Run ID:** ${repRID}" >> runDetails.md + cp runDetails.md Replicate_${repRID}.outputBag cp ${multiqc} Replicate_${repRID}.outputBag cp ${multiqcJSON} Replicate_${repRID}.outputBag bdbag Replicate_${repRID}.outputBag --archiver zip