diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2018-01-17 17:54:26 +0000 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2018-02-21 11:42:34 +0100 |
commit | 5476f2a1d4cc387c4868c1a69a7576a150db1ebc (patch) | |
tree | c7e63aacad303bdb06238e4820a992937e5697b7 /tests/integration/project | |
parent | cea43cb27f002a948558d0d4edc2b4e7131c9576 (diff) | |
download | buildstream-5476f2a1d4cc387c4868c1a69a7576a150db1ebc.tar.gz |
tests/integration: Use a minimal custom base sysroot
We have been using the Freedesktop SDK binaries to provide a base
system to run the integration tests. This works OK but it weighs in
at 985MB of content, and there is no simple way to customize it so
that we only download the bits we actually need.
This commit changes the tests to use a custom sysroot based on the
Alpine Linux distribution. The sysroot is 155MB unpacked, and packs down
to a 27MB .tar.xz.
This speeds up the integration tests significantly as we greatly reduce
the amount of network traffic required and the amount of data that gets
copied around when creating the staging area.
Diffstat (limited to 'tests/integration/project')
-rw-r--r-- | tests/integration/project/elements/base.bst | 3 | ||||
-rw-r--r-- | tests/integration/project/elements/base/base-alpine.bst | 12 | ||||
-rw-r--r-- | tests/integration/project/elements/base/base-sdk.bst | 18 | ||||
-rw-r--r-- | tests/integration/project/elements/base/usermerge.bst | 6 | ||||
-rw-r--r-- | tests/integration/project/files/usrmerge.tar.xz | bin | 232 -> 0 bytes |
5 files changed, 13 insertions, 26 deletions
diff --git a/tests/integration/project/elements/base.bst b/tests/integration/project/elements/base.bst index 6f2c56fa9..428afa736 100644 --- a/tests/integration/project/elements/base.bst +++ b/tests/integration/project/elements/base.bst @@ -2,5 +2,4 @@ kind: stack depends: - - base/base-sdk.bst - - base/usermerge.bst + - base/base-alpine.bst diff --git a/tests/integration/project/elements/base/base-alpine.bst b/tests/integration/project/elements/base/base-alpine.bst new file mode 100644 index 000000000..91327bc73 --- /dev/null +++ b/tests/integration/project/elements/base/base-alpine.bst @@ -0,0 +1,12 @@ +kind: import + +description: | + Alpine Linux base for tests + + Generated using the `tests/integration-tests/base/generate-base.sh` script. + +sources: + - kind: tar + url: https://gnome7.codethink.co.uk/tarballs/integration-tests-base.v1.x86_64.tar.xz + base-dir: '' + ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639 diff --git a/tests/integration/project/elements/base/base-sdk.bst b/tests/integration/project/elements/base/base-sdk.bst deleted file mode 100644 index 6b7418e99..000000000 --- a/tests/integration/project/elements/base/base-sdk.bst +++ /dev/null @@ -1,18 +0,0 @@ -kind: import -description: Import the base freedesktop SDK -(?): - - linux == True: - sources: - - kind: ostree - url: gnomesdk:repo/ - gpg-key: keys/gnome-sdk.gpg - track: runtime/org.freedesktop.BaseSdk/x86_64/1.6 - ref: 48b8c907522d3edeb0fb9f36c6515ce1ef5fb80a6e4e5dd54033b3fd6ad784d0 - - linux == False: - sources: - - kind: tar - url: gnome7:tarballs/gnome-sdk.tar.xz - ref: 96d5062a19fa9ac3439f8a502664f8d46860bad7efd28e7909b03ddbcdbe66e6 -config: - source: files - target: usr diff --git a/tests/integration/project/elements/base/usermerge.bst b/tests/integration/project/elements/base/usermerge.bst deleted file mode 100644 index fb9cffba9..000000000 --- a/tests/integration/project/elements/base/usermerge.bst +++ /dev/null @@ -1,6 +0,0 @@ -kind: import -description: Some symlinks for the flatpak runtime environment -sources: - - kind: tar - url: project_dir:/files/usrmerge.tar.xz - ref: 96e4458fafb85c10fe6271ad8839754b6eabeceac8523f8f602dea6470db5961 diff --git a/tests/integration/project/files/usrmerge.tar.xz b/tests/integration/project/files/usrmerge.tar.xz Binary files differdeleted file mode 100644 index e54fbbb43..000000000 --- a/tests/integration/project/files/usrmerge.tar.xz +++ /dev/null |