0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #42257 from thaJeztah/20.10_backport_fix_testinspect

Browse source 
[20.10 backport] Fix TestInspect(), and pin arm64 machines to a specific Ubuntu version
This commit is contained in:
Tibor Vass 2021-04-07 01:23:47 -07:00 committed by GitHub
commit 76b0df9b6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Jenkinsfile vendored
View file

@ -939,7 +939,7 @@ pipeline {
beforeAgent true
expression { params.arm64 }
}
agent { label 'arm64 && linux' }
agent { label 'arm64 && ubuntu-2004' }
environment {
TEST_SKIP_INTEGRATION_CLI = '1'
}

2
integration/service/inspect_test.go
View file

@ -88,7 +88,7 @@ func fullSwarmServiceSpec(name string, replicas uint64) swarmtypes.ServiceSpec {
Image: "busybox:latest",
Labels: map[string]string{"container-label": "container-value"},
Command: []string{"/bin/top"},
Args: []string{"-u", "root"},
Args: []string{"-d", "5"},
Hostname: "hostname",
Env: []string{"envvar=envvalue"},
Dir: "/work",