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.

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

Move nf-test files and container definitions #15

Merged
merged 37 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4566b3d
Move nf-test files and container definitions
drpatelh Nov 30, 2023
d27f656
Fix CI test triggers (which weren't active on PR)
adamrtalbot Nov 30, 2023
0d8c84c
Fix mistake in CI
adamrtalbot Nov 30, 2023
a0af0a4
Add FASTQC for testing purposes
adamrtalbot Nov 30, 2023
e50384e
Load test data
adamrtalbot Nov 30, 2023
fad7a36
Trying to load an extra param into tests
adamrtalbot Nov 30, 2023
4fdb050
Move pipeline level test back to pipeline folder
adamrtalbot Dec 1, 2023
6b0f457
Remove publish_dir_mode use because it broke stuff
adamrtalbot Dec 1, 2023
cb63b7a
Remove FastQC module
drpatelh Dec 1, 2023
8d271f8
Add wave.strategy precedence
drpatelh Dec 1, 2023
cf8b31e
Remove Conda profile from testing in CI
drpatelh Dec 1, 2023
e7216d0
Add publish_dir_mode parameter back
drpatelh Dec 1, 2023
36b9cd8
Remove lib path
drpatelh Dec 1, 2023
2475194
Remove config for test data
drpatelh Dec 1, 2023
031c97a
Add workflow tests
pinin4fjords Dec 4, 2023
0dbc431
Contains check for variable HTML
pinin4fjords Dec 4, 2023
58ed655
Switch to contains
pinin4fjords Dec 4, 2023
ad11443
Add subworkflow tests
pinin4fjords Dec 4, 2023
000be55
Remove unused params
pinin4fjords Dec 4, 2023
255a6d1
Bump to multiqc without fastqc
pinin4fjords Dec 5, 2023
34c1f75
Reinstate multiqc config
pinin4fjords Dec 5, 2023
155c629
Revert "Remove config for test data"
pinin4fjords Dec 5, 2023
23c0a05
Bump modules sha for test data
pinin4fjords Dec 5, 2023
13e6b4b
Fix typo
pinin4fjords Dec 5, 2023
7daa4e8
Try again to bypass the filtering
pinin4fjords Dec 5, 2023
7f87368
Fix env -> out
pinin4fjords Dec 5, 2023
651eda4
Fix output bit
pinin4fjords Dec 5, 2023
19f42db
fix up yq actions usage
pinin4fjords Dec 5, 2023
ec14aa0
Tweaks
pinin4fjords Dec 5, 2023
dec50d5
Remove reports from nf-test configuration
adamrtalbot Dec 6, 2023
68ccda2
Remove params from nf-aggregate workflow
drpatelh Dec 6, 2023
d5cd848
Remove explicit params.publish_dir_mode definition in tests
drpatelh Dec 6, 2023
d9521fa
Update UTILS_NFVALIDATION_PLUGIN subworkflow
adamrtalbot Dec 6, 2023
64fb120
Add final CI test to confirm all nf-tests passed
adamrtalbot Dec 6, 2023
20d8a3a
Try workdir thing
pinin4fjords Dec 6, 2023
520fd12
try tmpdir thing without closure
pinin4fjords Dec 6, 2023
9af0c7e
Ignore process selector warnings by default in favour of using -profi…
drpatelh Dec 6, 2023
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
3 changes: 0 additions & 3 deletions conf/container.config

This file was deleted.

1 change: 1 addition & 0 deletions modules/local/plot_run_gantt/main.nf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
process PLOT_RUN_GANTT {
tag "$meta.id"
conda 'click=8.0.1 pandas=1.1.5 plotly_express=0.4.1 typing=3.10.0.0'
container 'seqeralabs/nf-aggregate:click-8.0.1_pandas-1.1.5_plotly_express-0.4.1_typing-3.10.0.0--342dabfe6548a051'

input:
tuple val(meta), path(run_dump)
Expand Down
2 changes: 0 additions & 2 deletions modules/local/plot_run_gantt/tests/nextflow.config

This file was deleted.

1 change: 1 addition & 0 deletions modules/local/seqera_runs_dump/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ include { getRunMetadata } from './functions'
process SEQERA_RUNS_DUMP {
tag "$meta.id"
conda 'tower-cli=0.9.0'
container 'seqeralabs/nf-aggregate:tower-cli-0.9.0--2cb0f2e9d85d026b'
drpatelh marked this conversation as resolved.
Show resolved Hide resolved

input:
val meta
Expand Down
1 change: 0 additions & 1 deletion modules/local/seqera_runs_dump/tests/nextflow.config

This file was deleted.

13 changes: 5 additions & 8 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ profiles {
wave {
wave.enabled = true
wave.strategy = ['conda']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change this to ['conda', 'container', 'dockerfile', 'spack'] it will use these in that order, so a user could use Wave to copy the existing container without rebuilding.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. You want to push that change?

wave.build.repository = 'public.ecr.aws/seqera-labs/wave/containers'
wave.build.repository = 'quay.io/seqeralabs/nf-aggregate'
drpatelh marked this conversation as resolved.
Show resolved Hide resolved
wave.freeze = true
}
test_full {
Expand Down Expand Up @@ -157,10 +157,10 @@ profiles {
// Set default registry for Apptainer, Docker, Podman and Singularity independent of -profile
// Will not be used unless Apptainer / Docker / Podman / Singularity are enabled
// Set to your registry if you have a mirror of containers
apptainer.registry = 'public.ecr.aws/seqera-labs/wave/containers'
docker.registry = 'public.ecr.aws/seqera-labs/wave/containers'
podman.registry = 'public.ecr.aws/seqera-labs/wave/containers'
singularity.registry = 'public.ecr.aws/seqera-labs/wave/containers'
apptainer.registry = 'quay.io'
docker.registry = 'quay.io'
podman.registry = 'quay.io'
singularity.registry = 'quay.io'
drpatelh marked this conversation as resolved.
Show resolved Hide resolved

// Nextflow plugins
plugins {
Expand All @@ -182,9 +182,6 @@ env {
// Load Nextflow config for nf_aggregate workflow
includeConfig 'workflows/nf_aggregate/nextflow.config'

// Load container config for nf_aggregate workflow
includeConfig 'conf/container.config'

// Capture exit codes from upstream processes when piping
process.shell = ['/bin/bash', '-euo', 'pipefail']

Expand Down
5 changes: 0 additions & 5 deletions tests/nextflow.config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ nextflow_pipeline {

when {
params {
outdir = "results"
outdir = "results"
pinin4fjords marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
File renamed without changes.