diff options
| author | Valentin David <valentin.david@codethink.co.uk> | 2018-11-12 12:55:22 +0100 |
|---|---|---|
| committer | Valentin David <valentin.david@gmail.com> | 2018-11-14 11:43:33 +0000 |
| commit | c87d6e4506c620feb21c851248bd2f0b226160c0 (patch) | |
| tree | f841b5e80ff9bfb88137d67fbd88b90993c36d3e | |
| parent | e55a9703f9567953ee5675da4725940c08ec90eb (diff) | |
| download | buildstream-c87d6e4506c620feb21c851248bd2f0b226160c0.tar.gz | |
Run tests on aarch64
Fixes #755
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | tests/integration/project/elements/base/base-alpine.bst | 9 | ||||
| -rw-r--r-- | tests/integration/project/project.conf | 6 |
3 files changed, 24 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35a960b31..e030d7a54 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,25 +86,31 @@ source_dist: - coverage-linux/ tests-debian-9: - image: buildstream/testsuite-debian:9-master-119-552f5fc6 + image: buildstream/testsuite-debian:9-master-123-7ce6581b <<: *linux-tests tests-fedora-27: - image: buildstream/testsuite-fedora:27-master-119-552f5fc6 + image: buildstream/testsuite-fedora:27-master-123-7ce6581b <<: *linux-tests tests-fedora-28: - image: buildstream/testsuite-fedora:28-master-119-552f5fc6 + image: buildstream/testsuite-fedora:28-master-123-7ce6581b <<: *linux-tests tests-ubuntu-18.04: - image: buildstream/testsuite-ubuntu:18.04-master-119-552f5fc6 + image: buildstream/testsuite-ubuntu:18.04-master-123-7ce6581b + <<: *linux-tests + +tests-fedora-28-aarch64: + image: buildstream/testsuite-fedora:aarch64-28-master-123-7ce6581b + tags: + - aarch64 <<: *linux-tests tests-unix: # Use fedora here, to a) run a test on fedora and b) ensure that we # can get rid of ostree - this is not possible with debian-8 - image: buildstream/testsuite-fedora:27-master-119-552f5fc6 + image: buildstream/testsuite-fedora:27-master-123-7ce6581b stage: test variables: BST_FORCE_BACKEND: "unix" diff --git a/tests/integration/project/elements/base/base-alpine.bst b/tests/integration/project/elements/base/base-alpine.bst index 687588f7c..dd5ee7d88 100644 --- a/tests/integration/project/elements/base/base-alpine.bst +++ b/tests/integration/project/elements/base/base-alpine.bst @@ -7,6 +7,11 @@ description: | sources: - kind: tar - url: alpine:integration-tests-base.v1.x86_64.tar.xz base-dir: '' - ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639 + (?): + - arch == "x86_64": + ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639 + url: "alpine:integration-tests-base.v1.x86_64.tar.xz" + - arch == "aarch64": + ref: 431fb5362032ede6f172e70a3258354a8fd71fcbdeb1edebc0e20968c792329a + url: "alpine:integration-tests-base.v1.aarch64.tar.xz" diff --git a/tests/integration/project/project.conf b/tests/integration/project/project.conf index 3bf128543..e0475539a 100644 --- a/tests/integration/project/project.conf +++ b/tests/integration/project/project.conf @@ -9,6 +9,12 @@ options: type: bool description: Whether to expect a linux platform default: True + arch: + type: arch + description: Current architecture + values: + - x86_64 + - aarch64 split-rules: test: - | |