-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #733 from seqeralabs/mn-4.6
Upgrade to Micronaut 4.6
- Loading branch information
Showing
7 changed files
with
90 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,7 +21,6 @@ package io.seqera.wave.controller | |
import spock.lang.Specification | ||
import spock.lang.Unroll | ||
|
||
import java.nio.file.Path | ||
import java.time.Instant | ||
import java.time.temporal.ChronoUnit | ||
|
||
|
@@ -42,7 +41,6 @@ import io.seqera.wave.api.SubmitContainerTokenRequest | |
import io.seqera.wave.api.SubmitContainerTokenResponse | ||
import io.seqera.wave.config.CondaOpts | ||
import io.seqera.wave.configuration.BuildConfig | ||
import io.seqera.wave.configuration.ScanConfig | ||
import io.seqera.wave.core.ContainerPlatform | ||
import io.seqera.wave.core.RegistryProxyService | ||
import io.seqera.wave.exception.BadRequestException | ||
|
@@ -74,7 +72,6 @@ import jakarta.inject.Inject | |
* @author Paolo Di Tommaso <[email protected]> | ||
*/ | ||
@MicronautTest | ||
@Property(name='wave.build.workspace', value='/some/wsp') | ||
@Property(name='wave.build.repo', value='wave/build') | ||
@Property(name='wave.build.cache', value='wave/build/cache') | ||
class ContainerControllerTest extends Specification { | ||
|
@@ -103,13 +100,6 @@ class ContainerControllerTest extends Specification { | |
Mock(JobService) | ||
} | ||
|
||
@MockBean(ScanConfig) | ||
ScanConfig mockScanConfig() { | ||
Mock(ScanConfig) { | ||
getCacheDirectory() >> Path.of('/build/cache/dir') | ||
} | ||
} | ||
|
||
@MockBean(RegistryProxyService) | ||
RegistryProxyService mockProxy() { | ||
Mock(RegistryProxyService) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,13 +21,11 @@ package io.seqera.wave.service.builder | |
import spock.lang.Specification | ||
|
||
import java.nio.file.Files | ||
import java.nio.file.Path | ||
import java.time.Duration | ||
|
||
import io.micronaut.context.annotation.Property | ||
import io.micronaut.test.annotation.MockBean | ||
import io.micronaut.test.extensions.spock.annotation.MicronautTest | ||
import io.seqera.wave.configuration.ScanConfig | ||
import io.seqera.wave.core.ContainerPlatform | ||
import io.seqera.wave.service.k8s.K8sService | ||
import io.seqera.wave.service.k8s.K8sServiceImpl | ||
|
@@ -40,11 +38,9 @@ import jakarta.inject.Inject | |
* @author Paolo Di Tommaso <[email protected]> | ||
*/ | ||
@MicronautTest | ||
@Property(name="wave.build.workspace",value="/build/work") | ||
@Property(name="wave.build.k8s.namespace",value="foo") | ||
@Property(name="wave.build.k8s.configPath",value="/home/kube.config") | ||
@Property(name="wave.build.k8s.storage.claimName",value="bar") | ||
@Property(name="wave.build.k8s.storage.mountPath",value="/build") | ||
@Property(name='wave.build.k8s.node-selector[linux/amd64]',value="service=wave-build") | ||
@Property(name='wave.build.k8s.node-selector[linux/arm64]',value="service=wave-build-arm64") | ||
class KubeBuildStrategyTest extends Specification { | ||
|
@@ -60,12 +56,6 @@ class KubeBuildStrategyTest extends Specification { | |
Mock(K8sService) | ||
} | ||
|
||
@MockBean(ScanConfig) | ||
ScanConfig mockScanConfig() { | ||
Mock(ScanConfig) { | ||
getCacheDirectory() >> Path.of('/build/cache/dir') | ||
} | ||
} | ||
|
||
def "request to build a container with right selector"(){ | ||
given: | ||
|
Oops, something went wrong.