Merge pull request #42257 from thaJeztah/20.10_backport_fix_testinspect

[20.10 backport] Fix TestInspect(), and pin arm64 machines to a specific Ubuntu version
balena-os · Apr 7, 2021 · 76b0df9 · 76b0df9
2 parents 88bd96d + f2c0b36
commit 76b0df9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -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'
                     }

diff --git a/integration/service/inspect_test.go b/integration/service/inspect_test.go
@@ -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",