From 7ff0a994ffddb728dae23bc6b98f11a6632d1c6e Mon Sep 17 00:00:00 2001 From: Jordi Deu-Pons Date: Wed, 12 Nov 2025 12:37:46 +0100 Subject: [PATCH] Bump Fusion to version 2.5 This PR updates the default Fusion version from v2.4 to v2.5. All memory usage and stability issues from the previous attempt have been resolved in Fusion v2.5, making it ready for production use. Signed-off-by: Jordi Deu-Pons --- .../groovy/nextflow/fusion/FusionConfig.groovy | 8 ++++---- .../nextflow/fusion/FusionConfigTest.groovy | 8 ++++---- .../groovy/nextflow/script/FusionMetaTest.groovy | 2 +- .../io/seqera/wave/plugin/WaveClientTest.groovy | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/nextflow/src/main/groovy/nextflow/fusion/FusionConfig.groovy b/modules/nextflow/src/main/groovy/nextflow/fusion/FusionConfig.groovy index 5f9f0b0659..05befe9d72 100644 --- a/modules/nextflow/src/main/groovy/nextflow/fusion/FusionConfig.groovy +++ b/modules/nextflow/src/main/groovy/nextflow/fusion/FusionConfig.groovy @@ -42,10 +42,10 @@ import nextflow.util.MemoryUnit @CompileStatic class FusionConfig implements ConfigScope { - final static public String DEFAULT_FUSION_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.4-amd64.json' - final static public String DEFAULT_FUSION_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.4-arm64.json' - final static public String DEFAULT_SNAPSHOT_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.4-snap_amd64.json' - final static public String DEFAULT_SNAPSHOT_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.4-snap_arm64.json' + final static public String DEFAULT_FUSION_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.5-amd64.json' + final static public String DEFAULT_FUSION_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.5-arm64.json' + final static public String DEFAULT_SNAPSHOT_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.5-snap_amd64.json' + final static public String DEFAULT_SNAPSHOT_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.5-snap_arm64.json' final static public String DEFAULT_TAGS = "[.command.*|.exitcode|.fusion.*](nextflow.io/metadata=true),[*](nextflow.io/temporary=true)" diff --git a/modules/nextflow/src/test/groovy/nextflow/fusion/FusionConfigTest.groovy b/modules/nextflow/src/test/groovy/nextflow/fusion/FusionConfigTest.groovy index 9cf9cc4bd4..0dd9610328 100644 --- a/modules/nextflow/src/test/groovy/nextflow/fusion/FusionConfigTest.groovy +++ b/modules/nextflow/src/test/groovy/nextflow/fusion/FusionConfigTest.groovy @@ -136,9 +136,9 @@ class FusionConfigTest extends Specification { new FusionConfig([:]).retrieveFusionVersion(FUSION_URL) == EXPECTED where: FUSION_URL | EXPECTED - FusionConfig.DEFAULT_FUSION_AMD64_URL | '2.4' - FusionConfig.DEFAULT_FUSION_ARM64_URL | '2.4' - FusionConfig.DEFAULT_SNAPSHOT_AMD64_URL | '2.4' + FusionConfig.DEFAULT_FUSION_AMD64_URL | '2.5' + FusionConfig.DEFAULT_FUSION_ARM64_URL | '2.5' + FusionConfig.DEFAULT_SNAPSHOT_AMD64_URL | '2.5' 'https://foo.com/releases/v3.0-amd.json'| '3.0' } @@ -148,7 +148,7 @@ class FusionConfigTest extends Specification { where: FUSION_URL | ENABLED | EXPECTED null | false | null - null | true | '2.4' + null | true | '2.5' 'https://foo.com/releases/v4.0-amd64.json' | true | '4.0' 'https://foo.com/releases/v4.0.1-amd64.json' | true | '4.0.1' } diff --git a/modules/nextflow/src/test/groovy/nextflow/script/FusionMetaTest.groovy b/modules/nextflow/src/test/groovy/nextflow/script/FusionMetaTest.groovy index 47aac24289..c4377fb186 100644 --- a/modules/nextflow/src/test/groovy/nextflow/script/FusionMetaTest.groovy +++ b/modules/nextflow/src/test/groovy/nextflow/script/FusionMetaTest.groovy @@ -40,7 +40,7 @@ class FusionMetaTest extends Specification { OPTS | EXPECTED_ENABLED | EXPECTED_VERSION [:] | false | null [fusion:[enabled:false]] | false | null - [fusion:[enabled:true]] | true | '2.4' + [fusion:[enabled:true]] | true | '2.5' [fusion:[enabled:true, containerConfigUrl: 'https://foo.io/releases/v3.0-amd64.json']] | true | '3.0' } diff --git a/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy b/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy index aac31d8e93..c435dfc401 100644 --- a/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy +++ b/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy @@ -967,14 +967,14 @@ class WaveClientTest extends Specification { where: ARCH | SNAP | EXPECTED - 'linux/amd64' | null | 'https://fusionfs.seqera.io/releases/v2.4-amd64.json' - 'linux/x86_64' | null | 'https://fusionfs.seqera.io/releases/v2.4-amd64.json' - 'arm64' | null | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json' - 'linux/arm64' | null | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json' - 'linux/arm64/v8' | null | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json' - and: - 'linux/amd64' | true | 'https://fusionfs.seqera.io/releases/v2.4-snap_amd64.json' - 'linux/arm64' | true | 'https://fusionfs.seqera.io/releases/v2.4-snap_arm64.json' + 'linux/amd64' | null | 'https://fusionfs.seqera.io/releases/v2.5-amd64.json' + 'linux/x86_64' | null | 'https://fusionfs.seqera.io/releases/v2.5-amd64.json' + 'arm64' | null | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json' + 'linux/arm64' | null | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json' + 'linux/arm64/v8' | null | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json' + and: + 'linux/amd64' | true | 'https://fusionfs.seqera.io/releases/v2.5-snap_amd64.json' + 'linux/arm64' | true | 'https://fusionfs.seqera.io/releases/v2.5-snap_arm64.json' } @Unroll