From 9c1566a1dfa3eccd12e09a3e2cbda60503600d44 Mon Sep 17 00:00:00 2001 From: Lei Jitang Date: Mon, 4 Jul 2016 10:09:46 +0000 Subject: [PATCH] Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64 schema1 manifests is not working on ARM64, we should skip integration-cli tests for schema1 manifests on ARM64. Signed-off-by: Lei Jitang --- integration-cli/check_test.go | 2 +- integration-cli/requirements.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go index 4bdd9512e7..d14bdb5244 100644 --- a/integration-cli/check_test.go +++ b/integration-cli/check_test.go @@ -80,7 +80,7 @@ type DockerSchema1RegistrySuite struct { } func (s *DockerSchema1RegistrySuite) SetUpTest(c *check.C) { - testRequires(c, DaemonIsLinux, RegistryHosting) + testRequires(c, DaemonIsLinux, RegistryHosting, NotArm64) s.reg = setupRegistry(c, true, "", "") s.d = NewDaemon(c) } diff --git a/integration-cli/requirements.go b/integration-cli/requirements.go index 56a1596c2d..359359dab5 100644 --- a/integration-cli/requirements.go +++ b/integration-cli/requirements.go @@ -42,6 +42,10 @@ var ( func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" }, "Test requires a daemon not running on ARM", } + NotArm64 = testRequirement{ + func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm64" }, + "Test requires a daemon not running on arm64", + } NotPpc64le = testRequirement{ func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "ppc64le" }, "Test requires a daemon not running on ppc64le",