Skip to content

Commit 10fa131

Browse files
authored
Merge pull request #1473 from maxulysse/spark_again
fix(spark): load spark profile after loading the test profiles
2 parents fa504be + 5baecb0 commit 10fa131

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Balgattjåhkkå is the other top peak (over 2k m) in the Pårte massif, the othe
3535
- [#1422](https://github.com/nf-core/sarek/pull/1422) - Refactoring following `TEMPLATE` sync with `tools` `2.13`
3636
- [#1431](https://github.com/nf-core/sarek/pull/1431) - Using docker.containerOptions instead of docker.runOptions. Clearing containerOptions for SPARK modules for any kind of supported container engine
3737
- [#1439](https://github.com/nf-core/sarek/pull/1439) - Replacing the local module `BUILD_INTERVALS` with the nf-core module `GAWK`
38-
- [#1456](https://github.com/nf-core/sarek/pull/1456), [#1472](https://github.com/nf-core/sarek/pull/1472) - Revert usage of docker.runOptions. Add an empty docker.runOptions when using the new `spark` profile
38+
- [#1456](https://github.com/nf-core/sarek/pull/1456), [#1472](https://github.com/nf-core/sarek/pull/1472), [#1473](https://github.com/nf-core/sarek/pull/1473) - Revert usage of docker.runOptions. Add an empty docker.runOptions when using the new `spark` profile
3939
- [#1457](https://github.com/nf-core/sarek/pull/1457) - Update all modules
4040
- [#1466](https://github.com/nf-core/sarek/pull/1466) - Update `VEP`
4141

@@ -63,6 +63,7 @@ Balgattjåhkkå is the other top peak (over 2k m) in the Pårte massif, the othe
6363
- [#1471](https://github.com/nf-core/sarek/pull/1471) - Add `vep_cache_version` params to `validationSchemaIgnoreParams` to fix [#1454](https://github.com/nf-core/sarek/issues/1454)
6464
- [#1471](https://github.com/nf-core/sarek/pull/1471) - Update `vep_version` params match the actual tool version
6565
- [#1472](https://github.com/nf-core/sarek/pull/1472) - Cast `snpeff_db` params as a string to fix issues with Seqera Platform, as [#1471](https://github.com/nf-core/sarek/pull/1471) was not working as expected
66+
- [#1472](https://github.com/nf-core/sarek/pull/1472) - Load `spark` profile last to avoid issues with `test` profiles
6667

6768
### Removed
6869

nextflow.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,6 @@ profiles {
200200
arm {
201201
docker.runOptions = '-u $(id -u):$(id -g) --platform=linux/amd64'
202202
}
203-
spark {
204-
docker.runOptions = ''
205-
}
206203
singularity {
207204
apptainer.enabled = false
208205
charliecloud.enabled = false
@@ -289,6 +286,9 @@ profiles {
289286
test_full_germline_ncbench_agilent {
290287
includeConfig 'conf/test_full_germline_ncbench_agilent.config'
291288
}
289+
spark {
290+
docker.runOptions = ''
291+
}
292292

293293
// Extra test profiles for more complete CI
294294
alignment_to_fastq { includeConfig 'conf/test/alignment_to_fastq.config' }

0 commit comments

Comments
 (0)