github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #3222 from estesp/test-appveyor

Browse Source 
Update to sha-specific nanoserver image reference to fix AppVeyor CI runs
This commit is contained in:
Michael Crosby 2019-04-18 11:08:25 -04:00 committed by GitHub
commit b819d05fd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client_test.go
View File

@ -129,10 +129,11 @@ func TestMain(m *testing.M) {
}).Info("running tests against containerd") }).Info("running tests against containerd")
// pull a seed image // pull a seed image
log.G(ctx).Info("start to pull seed image")
if _, err = client.Pull(ctx, testImage, WithPullUnpack); err != nil { if _, err = client.Pull(ctx, testImage, WithPullUnpack); err != nil {
ctrd.Stop()
ctrd.Wait()
fmt.Fprintf(os.Stderr, "%s: %s\n", err, buf.String()) fmt.Fprintf(os.Stderr, "%s: %s\n", err, buf.String())
ctrd.Kill()
ctrd.Wait()
os.Exit(1) os.Exit(1)
} }

2
client_windows_test.go
View File

@ -23,7 +23,7 @@ import (
const ( const (
defaultAddress = `\\.\pipe\containerd-containerd-test` defaultAddress = `\\.\pipe\containerd-containerd-test`
testImage = "docker.io/microsoft/nanoserver:latest" testImage = "docker.io/microsoft/nanoserver@sha256:8f78a4a7da4464973a5cd239732626141aec97e69ba3e4023357628630bc1ee2"
) )
var ( var (