Skip to content

Commit ec228f6

Browse files
authored
Bump Fusion to version 2.5 (#6557)
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 <jordi@jordeu.net>
1 parent 480c55e commit ec228f6

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

modules/nextflow/src/main/groovy/nextflow/fusion/FusionConfig.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ import nextflow.util.MemoryUnit
4242
@CompileStatic
4343
class FusionConfig implements ConfigScope {
4444

45-
final static public String DEFAULT_FUSION_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.4-amd64.json'
46-
final static public String DEFAULT_FUSION_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
47-
final static public String DEFAULT_SNAPSHOT_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.4-snap_amd64.json'
48-
final static public String DEFAULT_SNAPSHOT_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.4-snap_arm64.json'
45+
final static public String DEFAULT_FUSION_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.5-amd64.json'
46+
final static public String DEFAULT_FUSION_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
47+
final static public String DEFAULT_SNAPSHOT_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.5-snap_amd64.json'
48+
final static public String DEFAULT_SNAPSHOT_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.5-snap_arm64.json'
4949

5050
final static public String DEFAULT_TAGS = "[.command.*|.exitcode|.fusion.*](nextflow.io/metadata=true),[*](nextflow.io/temporary=true)"
5151

modules/nextflow/src/test/groovy/nextflow/fusion/FusionConfigTest.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ class FusionConfigTest extends Specification {
136136
new FusionConfig([:]).retrieveFusionVersion(FUSION_URL) == EXPECTED
137137
where:
138138
FUSION_URL | EXPECTED
139-
FusionConfig.DEFAULT_FUSION_AMD64_URL | '2.4'
140-
FusionConfig.DEFAULT_FUSION_ARM64_URL | '2.4'
141-
FusionConfig.DEFAULT_SNAPSHOT_AMD64_URL | '2.4'
139+
FusionConfig.DEFAULT_FUSION_AMD64_URL | '2.5'
140+
FusionConfig.DEFAULT_FUSION_ARM64_URL | '2.5'
141+
FusionConfig.DEFAULT_SNAPSHOT_AMD64_URL | '2.5'
142142
'https://foo.com/releases/v3.0-amd.json'| '3.0'
143143
}
144144

@@ -148,7 +148,7 @@ class FusionConfigTest extends Specification {
148148
where:
149149
FUSION_URL | ENABLED | EXPECTED
150150
null | false | null
151-
null | true | '2.4'
151+
null | true | '2.5'
152152
'https://foo.com/releases/v4.0-amd64.json' | true | '4.0'
153153
'https://foo.com/releases/v4.0.1-amd64.json' | true | '4.0.1'
154154
}

modules/nextflow/src/test/groovy/nextflow/script/FusionMetaTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class FusionMetaTest extends Specification {
4040
OPTS | EXPECTED_ENABLED | EXPECTED_VERSION
4141
[:] | false | null
4242
[fusion:[enabled:false]] | false | null
43-
[fusion:[enabled:true]] | true | '2.4'
43+
[fusion:[enabled:true]] | true | '2.5'
4444
[fusion:[enabled:true, containerConfigUrl: 'https://foo.io/releases/v3.0-amd64.json']] | true | '3.0'
4545
}
4646

plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -967,14 +967,14 @@ class WaveClientTest extends Specification {
967967

968968
where:
969969
ARCH | SNAP | EXPECTED
970-
'linux/amd64' | null | 'https://fusionfs.seqera.io/releases/v2.4-amd64.json'
971-
'linux/x86_64' | null | 'https://fusionfs.seqera.io/releases/v2.4-amd64.json'
972-
'arm64' | null | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
973-
'linux/arm64' | null | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
974-
'linux/arm64/v8' | null | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
975-
and:
976-
'linux/amd64' | true | 'https://fusionfs.seqera.io/releases/v2.4-snap_amd64.json'
977-
'linux/arm64' | true | 'https://fusionfs.seqera.io/releases/v2.4-snap_arm64.json'
970+
'linux/amd64' | null | 'https://fusionfs.seqera.io/releases/v2.5-amd64.json'
971+
'linux/x86_64' | null | 'https://fusionfs.seqera.io/releases/v2.5-amd64.json'
972+
'arm64' | null | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
973+
'linux/arm64' | null | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
974+
'linux/arm64/v8' | null | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
975+
and:
976+
'linux/amd64' | true | 'https://fusionfs.seqera.io/releases/v2.5-snap_amd64.json'
977+
'linux/arm64' | true | 'https://fusionfs.seqera.io/releases/v2.5-snap_arm64.json'
978978
}
979979

980980
@Unroll

0 commit comments

Comments
 (0)