Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 318d556

Browse files
* Add some logs with e2e tests
* Simplify windows environment variables in e2e tests Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
1 parent 98f13c5 commit 318d556

2 files changed

Lines changed: 5 additions & 14 deletions

File tree

Jenkinsfile.baguette

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ pipeline {
148148
dir('e2e'){
149149
unstash "e2e"
150150
}
151-
sh './docker-app-e2e-linux --e2e-path=e2e'
151+
sh './docker-app-e2e-linux -test.v --e2e-path=e2e'
152152
}
153153
}
154154
post {
@@ -180,7 +180,7 @@ pipeline {
180180
dir('e2e'){
181181
unstash "e2e"
182182
}
183-
sh './docker-app-e2e-darwin --e2e-path=e2e'
183+
sh './docker-app-e2e-darwin -test.v --e2e-path=e2e'
184184
}
185185
}
186186
post {
@@ -212,7 +212,7 @@ pipeline {
212212
dir('e2e'){
213213
unstash "e2e"
214214
}
215-
bat 'docker-app-e2e-windows.exe --e2e-path=e2e'
215+
bat 'docker-app-e2e-windows.exe -test.v --e2e-path=e2e'
216216
}
217217
}
218218
post {

e2e/commands_test.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"os"
77
"path/filepath"
88
"regexp"
9-
"runtime"
109
"strings"
1110
"testing"
1211

@@ -329,19 +328,11 @@ func TestDockerAppLifecycle(t *testing.T) {
329328
defer tmpDir.Remove()
330329

331330
cmd := icmd.Cmd{
332-
Env: []string{
331+
Env: append(os.Environ(),
333332
fmt.Sprintf("DUFFLE_HOME=%s", tmpDir.Path()),
334333
fmt.Sprintf("DOCKER_CONFIG=%s", tmpDir.Path()),
335334
"DOCKER_TARGET_CONTEXT=swarm-target-context",
336-
},
337-
}
338-
339-
// We need to explicitly set the SYSTEMROOT on windows
340-
// otherwise we get the error:
341-
// "panic: failed to read random bytes: CryptAcquireContext: Provider DLL failed to initialize correctly."
342-
// See: https://github.com/golang/go/issues/25210
343-
if runtime.GOOS == "windows" {
344-
cmd.Env = append(cmd.Env, `SYSTEMROOT=C:\WINDOWS`)
335+
),
345336
}
346337

347338
// Running a swarm using docker in docker to install the application

0 commit comments

Comments
 (0)