diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-01-23 12:08:27 +0100 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-01-23 12:08:27 +0100 |
commit | 5aaef5c5decbf4dd43dfd1bb8d2a7d9e049a8580 (patch) | |
tree | 9f4ce853b9bc2d2b5433d8f0bec18749e93d8ba3 /gnu/ci.scm | |
parent | 38f77be464b0b6ca76105d5f0a1b5e55fd694036 (diff) | |
parent | 6a6799b27af8646da112d51bedb8e5ff6158e425 (diff) | |
download | guix-5aaef5c5decbf4dd43dfd1bb8d2a7d9e049a8580.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/ci.scm')
-rw-r--r-- | gnu/ci.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm index 943fbb6af6..2c04b7189d 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -250,7 +250,11 @@ system.") "." system)))) (cons name (test->thunk test)))) - (if (member system %guixsd-supported-systems) + (if (and (member system %guixsd-supported-systems) + + ;; XXX: Our build farm has too few ARMv7 machines and they are very + ;; slow, so skip system tests there. + (not (string=? system "armhf-linux"))) ;; Override the value of 'current-guix' used by system tests. Using a ;; channel instance makes tests that rely on 'current-guix' less ;; expensive. It also makes sure we get a valid Guix package when this |