Skip to content

Commit 71dff12

Browse files
authored
Merge pull request #17 from TRON-Bioinformatics/add-ci-profile
Added CI profile and update conda profile
2 parents a882743 + 31f8dc7 commit 71dff12

File tree

11 files changed

+20
-15
lines changed

11 files changed

+20
-15
lines changed

nextflow.config

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,23 @@
55
*/
66

77
profiles {
8-
conda { params.enable_conda = true }
8+
conda {
9+
params.enable_conda = true
10+
conda.enabled = true
11+
}
912
debug { process.beforeScript = 'echo $HOSTNAME' }
10-
test {
11-
params.reference = "$baseDir/test/data/ucsc.hg19.minimal.fasta"
12-
params.input_vcfs = "$baseDir/test/data/test_input.txt"
13+
ci {
1314
params.cpus = 1
1415
params.memory = "3g"
1516
timeline.enabled = false
1617
report.enabled = false
1718
trace.enabled = false
1819
dag.enabled = false
1920
}
21+
test {
22+
params.reference = "$baseDir/test/data/ucsc.hg19.minimal.fasta"
23+
params.input_vcfs = "$baseDir/test/data/test_input.txt"
24+
}
2025
}
2126

2227
// Export this variable to prevent local Python libraries from conflicting with those in the container

test/scripts/run_test_0.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ output_folder=test/output/test0
44

55
nextflow main.nf --help
66

7-
nextflow main.nf -profile test,conda --output $output_folder --skip_normalization
7+
nextflow main.nf -profile test,conda,ci --output $output_folder --skip_normalization
88

99
# missing SNpEff data folder
10-
nextflow main.nf -profile test,conda --output $output_folder --snpeff_organism hg19
10+
nextflow main.nf -profile test,conda,ci --output $output_folder --snpeff_organism hg19
1111
test ! -d $output_folder

test/scripts/run_test_1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
source test/scripts/assert.sh
55
output_folder=test/output/test1
66

7-
nextflow main.nf -profile test,conda --output $output_folder
7+
nextflow main.nf -profile test,conda,ci --output $output_folder
88

99
test -s $output_folder/single_sample/single_sample.normalized.vcf || { echo "Missing test 1 output file!"; exit 1; }
1010
test -s $output_folder/tumor_normal/tumor_normal.normalized.vcf || { echo "Missing test 1 output file!"; exit 1; }

test/scripts/run_test_2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source test/scripts/assert.sh
55
output_folder=test/output/test2
6-
nextflow main.nf -profile test,conda --output $output_folder --filter PASS,MNV
6+
nextflow main.nf -profile test,conda,ci --output $output_folder --filter PASS,MNV
77
test -s $output_folder/single_sample/single_sample.normalized.vcf || { echo "Missing test 2 output file!"; exit 1; }
88
test -s $output_folder/tumor_normal/tumor_normal.normalized.vcf || { echo "Missing test 2 output file!"; exit 1; }
99
assert_eq `wc -l $output_folder/single_sample/single_sample.normalized.vcf | cut -d' ' -f 1` 34 "Wrong number of variants"

test/scripts/run_test_3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source test/scripts/assert.sh
55
output_folder=test/output/test3
6-
nextflow main.nf -profile test,conda --output $output_folder --skip_decompose_complex
6+
nextflow main.nf -profile test,conda,ci --output $output_folder --skip_decompose_complex
77
test -s $output_folder/single_sample/single_sample.normalized.vcf || { echo "Missing test 2 output file!"; exit 1; }
88
test -s $output_folder/tumor_normal/tumor_normal.normalized.vcf || { echo "Missing test 2 output file!"; exit 1; }
99
assert_eq `wc -l $output_folder/single_sample/single_sample.normalized.vcf | cut -d' ' -f 1` 47 "Wrong number of variants"

test/scripts/run_test_4.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
source test/scripts/assert.sh
55
output_folder=test/output/test4
6-
nextflow main.nf -profile test,conda --input_vcfs test/data/test_input_no_ad.txt --output $output_folder
6+
nextflow main.nf -profile test,conda,ci --input_vcfs test/data/test_input_no_ad.txt --output $output_folder
77
test -s $output_folder/sample_no_ad/sample_no_ad.normalized.vcf || { echo "Missing test 4 output file!"; exit 1; }
88
assert_eq `wc -l $output_folder/sample_no_ad/sample_no_ad.normalized.vcf | cut -d' ' -f 1` 52 "Wrong number of variants"

test/scripts/run_test_5.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
source test/scripts/assert.sh
55
output_folder=test/output/test5
6-
nextflow main.nf -profile test,conda --output $output_folder --input_vcfs false --input_vcf test/data/test_single_sample.vcf
6+
nextflow main.nf -profile test,conda,ci --output $output_folder --input_vcfs false --input_vcf test/data/test_single_sample.vcf
77
test -s $output_folder/test_single_sample/test_single_sample.normalized.vcf || { echo "Missing test 4 output file!"; exit 1; }
88
assert_eq `wc -l $output_folder/test_single_sample/test_single_sample.normalized.vcf | cut -d' ' -f 1` 53 "Wrong number of variants"

test/scripts/run_test_6.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ echo -e "single_sample\tnormal:"`pwd`"/test/data/TESTX_S1_L001.bam" >> test/data
1313
echo -e "single_sample\tnormal:"`pwd`"/test/data/TESTX_S1_L002.bam" >> test/data/test_bams.txt
1414

1515
# run
16-
nextflow main.nf -profile test,conda --output $output_folder --input_bams test/data/test_bams.txt
16+
nextflow main.nf -profile test,conda,ci --output $output_folder --input_bams test/data/test_bams.txt
1717

1818
# check results
1919
test -s $output_folder/single_sample/single_sample.normalized.vcf || { echo "Missing test 6 output file!"; exit 1; }

test/scripts/run_test_7.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo -e "single_sample\ttumor:"`pwd`"/test/data/TESTX_S1_L001.bam" >> test/data/
99
echo -e "single_sample\ttumor:"`pwd`"/test/data/TESTX_S1_L002.bam" >> test/data/test_bams.txt
1010
echo -e "single_sample\tnormal:"`pwd`"/test/data/TESTX_S1_L001.bam" >> test/data/test_bams.txt
1111
echo -e "single_sample\tnormal:"`pwd`"/test/data/TESTX_S1_L002.bam" >> test/data/test_bams.txt
12-
nextflow main.nf -profile test,conda --output $output_folder --input_bams test/data/test_bams.txt --skip_multiallelic_filter
12+
nextflow main.nf -profile test,conda,ci --output $output_folder --input_bams test/data/test_bams.txt --skip_multiallelic_filter
1313
test -s $output_folder/single_sample/single_sample.normalized.vcf || { echo "Missing test 7 output file!"; exit 1; }
1414
test -s $output_folder/tumor_normal/tumor_normal.normalized.vcf || { echo "Missing test 7 output file!"; exit 1; }
1515
test -s $output_folder/single_sample/single_sample.vaf.vcf || { echo "Missing test 7 output file!"; exit 1; }

test/scripts/run_test_8.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ echo -e "single_sample\ttumor:"`pwd`"/test/data/TESTX_S1_L002.bam" >> test/data/
1111
echo -e "single_sample\tnormal:"`pwd`"/test/data/TESTX_S1_L001.bam" >> test/data/test_bams.txt
1212
echo -e "single_sample\tnormal:"`pwd`"/test/data/TESTX_S1_L002.bam" >> test/data/test_bams.txt
1313

14-
nextflow main.nf -profile test,conda --output $output_folder --input_bams test/data/test_bams.txt
14+
nextflow main.nf -profile test,conda,ci --output $output_folder --input_bams test/data/test_bams.txt
1515

1616
test -s $output_folder/single_sample/single_sample.normalized.vcf || { echo "Missing test 8 output file!"; exit 1; }
1717
test -s $output_folder/tumor_normal/tumor_normal.normalized.vcf || { echo "Missing test 8 output file!"; exit 1; }

test/scripts/run_test_9.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source test/scripts/assert.sh
55
output_folder=test/output/test9
66
snpeff_datadir=/home/you/snpeff
77

8-
nextflow main.nf -profile test,conda --output $output_folder --snpeff_organism hg19 --snpeff_datadir $snpeff_datadir
8+
nextflow main.nf -profile test,conda,ci --output $output_folder --snpeff_organism hg19 --snpeff_datadir $snpeff_datadir
99

1010
test -s $output_folder/single_sample/single_sample.normalized.vcf || { echo "Missing test 1 output file!"; exit 1; }
1111
test -s $output_folder/tumor_normal/tumor_normal.normalized.vcf || { echo "Missing test 1 output file!"; exit 1; }

0 commit comments

Comments
 (0)