Bump Fusion to version 2.5 (2nd attempt) [ci fast]

Signed-off-by: Paolo Di Tommaso <[email protected]>
nextflow-io · Jan 27, 2025 · a7f09ae · a7f09ae
1 parent 19c40a4
commit a7f09ae
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/modules/nextflow/src/main/groovy/nextflow/fusion/FusionConfig.groovy b/modules/nextflow/src/main/groovy/nextflow/fusion/FusionConfig.groovy
@@ -34,8 +34,8 @@ import nextflow.util.MemoryUnit
 @CompileStatic
 class FusionConfig {
 
-    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_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_TAGS = "[.command.*|.exitcode|.fusion.*](nextflow.io/metadata=true),[*](nextflow.io/temporary=true)"
 
     final static public String FUSION_PATH = '/usr/bin/fusion'

diff --git a/modules/nextflow/src/test/groovy/nextflow/fusion/FusionConfigTest.groovy b/modules/nextflow/src/test/groovy/nextflow/fusion/FusionConfigTest.groovy
@@ -136,8 +136,8 @@ 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_FUSION_AMD64_URL   | '2.5'
+        FusionConfig.DEFAULT_FUSION_ARM64_URL   | '2.5'
         'https://foo.com/releases/v3.0-amd.json'| '3.0'
     }
 
@@ -147,7 +147,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
@@ -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
@@ -989,11 +989,11 @@ class WaveClientTest extends Specification {
 
         where:
         ARCH                | EXPECTED
-        'linux/amd64'       | 'https://fusionfs.seqera.io/releases/v2.4-amd64.json'
-        'linux/x86_64'      | 'https://fusionfs.seqera.io/releases/v2.4-amd64.json'
-        'arm64'             | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
-        'linux/arm64'       | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
-        'linux/arm64/v8'    | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
+        'linux/amd64'       | 'https://fusionfs.seqera.io/releases/v2.5-amd64.json'
+        'linux/x86_64'      | 'https://fusionfs.seqera.io/releases/v2.5-amd64.json'
+        'arm64'             | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
+        'linux/arm64'       | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
+        'linux/arm64/v8'    | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
     }
 
     @Unroll