Skip to content

Commit 69062b2

Browse files
committed
Fix azure tests
Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
1 parent 884d667 commit 69062b2

5 files changed

Lines changed: 5 additions & 12 deletions

File tree

config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,4 @@ wave:
1111
195996028523.dkr.ecr.eu-west-1.amazonaws.com:
1212
username : "${AWS_ACCESS_KEY_ID:}"
1313
password : "${AWS_SECRET_ACCESS_KEY:}"
14-
seqeralabs.azurecr.io:
15-
username : "${AZURECR_USER:}"
16-
password : "${AZURECR_PAT:}"
1714
...

docs/configuration.mdx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ These configurations are important for the Wave authentication to the repositori
5858

5959
- **`wave.registries.<AWS ECR Repo name>.password`**: the AWS ECR password for authentication. An example AWS ECR Repo name is `195996028523.dkr.ecr.eu-west-1.amazonaws.com`. It can be set using `${AWS_SECRET_ACCESS_KEY}` environment variable. *Optional*.
6060

61-
- **`wave.registries.<azurecr Repo name>.username`**: the Azure Container Registry username for authentication. An example of an Azure Container Registry Repo name is `seqeralabs.azurecr.io`. It can be set using `${AZURECR_USER}` environment variable. *Optional*.
62-
63-
- **`wave.registries.<azurecr Repo name>.password`**: the Azure Container Registry password or PAT for authentication. An example of an Azure Container Registry Repo name is `seqeralabs.azurecr.io`. It can be set using `${AZURECR_PAT}` environment variable. *Optional*.
64-
6561
## HTTP client configuration
6662

6763
- **`wave.httpclient.connectTimeout`**: sets the connection timeout for the HTTP client. Its default value is `20s`*Optional*.

src/test/groovy/io/seqera/wave/auth/RegistryAuthServiceTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ class RegistryAuthServiceTest extends Specification implements SecureDockerRegis
5454
String quayPassword
5555

5656
@Shared
57-
@Value('${wave.registries.seqeralabs.azurecr.io.username}')
57+
@Value('${wave.registries.wavetest.azurecr.io.username}')
5858
String azureUsername
5959
@Shared
60-
@Value('${wave.registries.seqeralabs.azurecr.io.password}')
60+
@Value('${wave.registries.wavetest.azurecr.io.password}')
6161
String azurePassword
6262

6363
@Shared
@@ -98,7 +98,7 @@ class RegistryAuthServiceTest extends Specification implements SecureDockerRegis
9898
@IgnoreIf({!System.getenv('AZURECR_USER')})
9999
void 'test valid azure login'() {
100100
given:
101-
def REGISTRY_URL = 'seqeralabs.azurecr.io'
101+
def REGISTRY_URL = 'wavetest.azurecr.io'
102102

103103
expect:
104104
loginService.login(REGISTRY_URL, azureUsername, azurePassword)

src/test/groovy/io/seqera/wave/service/builder/ContainerBuildServiceLiveTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class ContainerBuildServiceLiveTest extends Specification {
204204
def 'should build & push container to azure' () {
205205
given:
206206
def folder = Files.createTempDirectory('test')
207-
def buildRepo = "seqeralabs.azurecr.io/wave-tests"
207+
def buildRepo = "wavetest.azurecr.io/wave-tests"
208208
def cacheRepo = buildConfig.defaultCacheRepository
209209
and:
210210
def dockerFile = '''

src/test/resources/application-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ wave:
3939
public.ecr.aws:
4040
username: ${AWS_ACCESS_KEY_ID:test}
4141
password: ${AWS_SECRET_ACCESS_KEY:test}
42-
seqeralabs.azurecr.io:
42+
wavetest.azurecr.io:
4343
username: ${AZURECR_USER:test}
4444
password: ${AZURECR_PAT:test}
4545
europe-southwest1-docker.pkg.dev:

0 commit comments

Comments
 (0)