Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI memory requests #131

Merged
merged 3 commits into from
Feb 14, 2024
+72 −17
Merged

Fix CI memory requests #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88a7852
test: build config from fetchngs
edmundmiller Feb 14, 2024
dfc0450
test: Hard code params into config
edmundmiller Feb 14, 2024
92299f3
chore: Bump snapshots
edmundmiller Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions nf-test.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
config {

testsDir "tests"
workDir ".nf-test"
configFile "conf/test.config"
profile "test"
workDir System.getenv("NFT_WORKDIR") ?: ".nf-test"
configFile "tests/nextflow.config"

}
44 changes: 44 additions & 0 deletions tests/nextflow.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
params {
// Base directory for nf-core/modules test data
modules_testdata_base_path = 's3://ngi-igenomes/testdata/nf-core/modules/'

// Base directory for nf-core/nascent test data
// TODO
// pipelines_testdata_base_path = 's3://ngi-igenomes/testdata/nf-core/pipelines/nascent/1.15.0/'
}

// Impose sensible resource limits for testing
process {
withName: '.*' {
cpus = 2
memory = 3.GB
time = 2.h
}
}

// Impose same minimum Nextflow version as the pipeline for testing
manifest {
nextflowVersion = '!>=23.04.0'
}

// Disable all Nextflow reporting options
timeline { enabled = false }
report { enabled = false }
trace { enabled = false }
dag { enabled = false }

// HACK Hard code all the params for now
params {
// Input data
input = "${projectDir}/assets/samplesheet.csv"

// Genome references
fasta = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/GRCh38_chr21.fa'
gtf = 'https://raw.githubusercontent.com/nf-core/test-datasets/nascent/reference/genes_chr21.gtf'

assay_type = "GROseq"
skip_grohmm = true // FIXME Fails due to higher memory requirements
tuning_file = "${projectDir}/tests/config/tuningparams_small.csv"
filter_bed = "${projectDir}/tests/config/unwanted_region.bed"
intersect_bed = "${projectDir}/tests/config/wanted_region.bed"
}
40 changes: 26 additions & 14 deletions tests/pipeline/main.nf.test.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,35 +47,39 @@
"cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2",
"cd4_REP1.sorted.bam:md5,22e9e4ede572d35363dc3ec23eb9c79b",
"cd4_REP1.sorted.bam.bai:md5,c5e37e318050b43fb6692cd86491d4b0",
"cd4_REP1.stats:md5,c79d90093754dc7ce517906321d2970a",
"cd4_REP1.stats:md5,f4aa5b8d3fea2797724bf2fa12961036",
"cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc",
"cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a",
"cd4_REP2.sorted.bam:md5,fb718ea76a1e22bda674e23a92662531",
"cd4_REP2.sorted.bam.bai:md5,7f9d67f8572c50bddc57f8296b811fd8",
"cd4_REP2.stats:md5,2e408207632150b3c0a81da516106bd0",
"cd4_REP2.stats:md5,9952636336505197c44c9ce1f7314096",
"cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f",
"cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938",
"cd4_REP3.sorted.bam:md5,6043c68b66e294d4be039bd6c8390ed5",
"cd4_REP3.sorted.bam.bai:md5,bb66de0f0efc0231d8252754cf8dc5c5",
"cd4_REP3.stats:md5,df54484f9f9d3f206e7b6d38ef796323",
"cd4_REP3.stats:md5,4f63629b6850326e1dbf449732bc7bf3",
"cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8",
"cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e",
"cd4_REP4.sorted.bam:md5,d1d055ab384159184f6abf2b23cf8c9e",
"cd4_REP4.sorted.bam.bai:md5,c70457bfeb054ab60e673aee4a247331",
"cd4_REP4.stats:md5,8291b3978fcab50f3cb3f24ae7e4831f",
"cd4_REP4.stats:md5,87c41cda4168ed794b640bfbd0e99d45",
"jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421",
"jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32",
"jurkat_REP1.sorted.bam:md5,558e3948f1d263113d86f13dadead6a4",
"jurkat_REP1.sorted.bam.bai:md5,62956925d0600af04cd40dc1c57fd110",
"jurkat_REP1.stats:md5,3dbf9a360d4c5fb1c924e1fc96270b03",
"jurkat_REP1.stats:md5,677f4ec974fed98323ec41ab2f96049d",
"jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d",
"jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9",
"jurkat_REP2.sorted.bam:md5,f27e3736718fec53c189f7866932d28d",
"jurkat_REP2.sorted.bam.bai:md5,a2f3e49a63c02bde49c24c56a1050606",
"jurkat_REP2.stats:md5,4301b92c81d0ecc9d8ee5d42199b367b"
"jurkat_REP2.stats:md5,f3be1f30d42067a85b0487bec047c49b"
]
],
"timestamp": "2024-01-29T13:49:14.595161469"
"meta": {
"nf-test": "0.8.4",
"nextflow": "23.10.1"
},
"timestamp": "2024-02-13T22:00:59.731946823"
},
"Should run with bwamem2": {
"content": [
Expand Down Expand Up @@ -125,35 +129,39 @@
"cd4_REP1.idxstats:md5,b1dd8bcbd23c53c21f0e11082d9315f2",
"cd4_REP1.sorted.bam:md5,588def280611859a2b9c43c564975dc3",
"cd4_REP1.sorted.bam.bai:md5,18d34e747d0986c043a6f0d14dee456b",
"cd4_REP1.stats:md5,c79d90093754dc7ce517906321d2970a",
"cd4_REP1.stats:md5,f4aa5b8d3fea2797724bf2fa12961036",
"cd4_REP2.flagstat:md5,0fd86dbf8f799fad49ba471702979bdc",
"cd4_REP2.idxstats:md5,53204e4c6a9f68664087e4a8123be46a",
"cd4_REP2.sorted.bam:md5,0b67045362a25692019cb9fd57bb2df5",
"cd4_REP2.sorted.bam.bai:md5,b03b5ced803ae927ab5a2f601abd3dcc",
"cd4_REP2.stats:md5,2e408207632150b3c0a81da516106bd0",
"cd4_REP2.stats:md5,9952636336505197c44c9ce1f7314096",
"cd4_REP3.flagstat:md5,793c9cadbf80e35dbae3774e9b5bd93f",
"cd4_REP3.idxstats:md5,42de227ff397013cf288759871b0e938",
"cd4_REP3.sorted.bam:md5,7596ac9246a703dc8bce2cc1ae2b99d6",
"cd4_REP3.sorted.bam.bai:md5,2a5802af6f299dd0f7ab8eee9552100a",
"cd4_REP3.stats:md5,df54484f9f9d3f206e7b6d38ef796323",
"cd4_REP3.stats:md5,4f63629b6850326e1dbf449732bc7bf3",
"cd4_REP4.flagstat:md5,ed6c609505097f3cc9d9902d69e016f8",
"cd4_REP4.idxstats:md5,959dc185ae59de4cebe374026711a55e",
"cd4_REP4.sorted.bam:md5,f63e2cdb10fa5b28acc564fb2f99ef3a",
"cd4_REP4.sorted.bam.bai:md5,13d7de8a2c84b23998d59e41f78dc79c",
"cd4_REP4.stats:md5,8291b3978fcab50f3cb3f24ae7e4831f",
"cd4_REP4.stats:md5,87c41cda4168ed794b640bfbd0e99d45",
"jurkat_REP1.flagstat:md5,fd5f02b0f02a407447b804b1d80f5421",
"jurkat_REP1.idxstats:md5,c61af0847c1ad76c06a8de2815975b32",
"jurkat_REP1.sorted.bam:md5,f1d8db3612bf8917f723162f9ae07226",
"jurkat_REP1.sorted.bam.bai:md5,19066b9272a3e73f9fc853be05f21220",
"jurkat_REP1.stats:md5,3dbf9a360d4c5fb1c924e1fc96270b03",
"jurkat_REP1.stats:md5,677f4ec974fed98323ec41ab2f96049d",
"jurkat_REP2.flagstat:md5,86ed47bd41a745ab59de473082c7742d",
"jurkat_REP2.idxstats:md5,3db8f88c1f836eb5d10f37ca1df81ae9",
"jurkat_REP2.sorted.bam:md5,a2c15ebbc6d24e0dabaa15b57a900248",
"jurkat_REP2.sorted.bam.bai:md5,ae37c8fe3e780d068f5e32310bbcf387",
"jurkat_REP2.stats:md5,4301b92c81d0ecc9d8ee5d42199b367b"
"jurkat_REP2.stats:md5,f3be1f30d42067a85b0487bec047c49b"
]
],
"timestamp": "2024-01-29T16:08:44.305044131"
"meta": {
"nf-test": "0.8.4",
"nextflow": "23.10.1"
},
"timestamp": "2024-02-13T22:02:42.148478009"
},
"Should run with dragmap": {
"content": [
Expand Down Expand Up @@ -198,6 +206,10 @@
"jurkat_REP2.lc_extrap.txt:md5,33bdd91e7df616988c1ec043818b346b"
]
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "23.10.1"
},
"timestamp": "2023-08-25T01:46:44+0000"
}
}
Loading