diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 141fc56791d1cea908250ece29e2b32dfe6a8355..5f9b6fc2736d3cb977cfb9b5d956d053bfc4f46f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,8 +16,13 @@ variables: refHuVersion: "38.p13.v36" refERCCVersion: "92" dir: "/project/BICF/BICF_Core/shared/gudmap/singularity_cache/" + dnanexusEnv: true + awsEnv: false + azureEnv: false + gcpEnv: false stages: + - environment - singularity - versions - aggregation @@ -916,7 +921,7 @@ override_fastq: script: - hostname - ulimit -a - - nextflow -q run ./rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5F6 --source staging --fastqsForce './test_data/fastq/small/Q-Y5F6_1M.R{1,2}.fastq.gz' --upload false --dev false --ci true --track false -with-report ./fastqOverride_report.html + - nextflow -q run ./rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5F6 --source staging --fastqsForce './test_data/fastq/small/Q-Y5F6_1M.R{1,2}.fastq.gz' --upload false --dev false --ci true --track false -with-report ./fastqOverride_report.html - find . -type f -name "multiqc_data.json" -exec cp {} ./fastqOverride_multiqc_data.json \; - find ./**/report/ -type f -name "*multiqc.html" -exec cp {} ./fastqOverride_multiqc.html \; - pytest -m completionMultiqc --filename fastqOverride_multiqc_data.json @@ -1008,19 +1013,14 @@ override_spike: - always -consistency: - stage: consistency - only: [merge_requests] +dnanexus: + stage: environment except: variables: - - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /master/ + - $dnanexusEnv == false script: - - pytest -m consistencySE - - pytest -m consistencyPE - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - SE_multiqc_data.json - - PE_multiqc_data.json - expire_in: 7 days \ No newline at end of file + - hostname + - ulimit -a + - module load dxtoolkit/python27/0.294.0 + - export NXF_XPACK_LICENSE=${nxf_license} + - dx upload ./test_data/fastq/small/Q-Y5F6_1M.R{1,2}.fastq.gz --path /ci-env/input/ --parents --auth-token ${dnanexus_authToken} --workspace-id ${dnanexus_workspace} \ No newline at end of file diff --git a/docs/nxf_dnanexus-ci-test.json b/docs/nxf_dnanexus-ci-test.json new file mode 100644 index 0000000000000000000000000000000000000000..4299aa697f92b4a86828a5cf117223278fc32388 --- /dev/null +++ b/docs/nxf_dnanexus-ci-test.json @@ -0,0 +1,5 @@ +{ + "pipeline_url": "https://git.biohpc.swmed.edu/gudmap_rbk/rna-seq.git -r develop", + "args": "-profile dnanexus --deriva dx://NextFlow_Prototype:test_data/rna-seq/auth/credential.json --bdbag dx://NextFlow_Prototype:auth/cookies.txt --repRID Q-Y5F6 --source staging --upload false --dev true --ci false --track false -with-report dx://NextFlow_Prototype:gudmap_rbk-output/Q-Y5F6_fastqoverride_report.html --refSource datahub --outDir dx://NextFlow_Prototype:gudmap_rbk-output/Q-Y5F6_fastqoverride, --fastqsForce dx://NextFlow_Prototype:test_data/rna-seq/fastq/small/*.fastq.gz", + "license": "$NXF_XPACK_LICENSE" +}