Skip to content

Bump Fusion to version 2.5 #6557

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −17
Draft

Bump Fusion to version 2.5 #6557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions modules/nextflow/src/main/groovy/nextflow/fusion/FusionConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down
8 changes: 4 additions & 4 deletions modules/nextflow/src/test/groovy/nextflow/fusion/FusionConfigTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand All @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion modules/nextflow/src/test/groovy/nextflow/script/FusionMetaTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
16 changes: 8 additions & 8 deletions plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading