summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.van.berkom@gmail.com>2018-08-24 08:39:19 +0000
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2018-08-24 08:39:19 +0000
commit255f9ee3eb512e64ca5a674c1144345e5d79843b (patch)
tree33e43602b58a549f9b49e18cbe07da96a64b1db7
parentf7ef151bd8e5585d26e5ec572d507f28659a384b (diff)
parentfa476d79408aa2bd842c51a0f45c241e7639ff83 (diff)
downloadbuildstream-255f9ee3eb512e64ca5a674c1144345e5d79843b.tar.gz
Merge branch 'tristan/avoid-redundant-alpine' into 'master'
tests/integration/project: Use the same alias for the alpine tarball See merge request BuildStream/buildstream!722
-rw-r--r--tests/integration/project/elements/base/base-alpine.bst2
-rw-r--r--tests/integration/project/project.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/integration/project/elements/base/base-alpine.bst b/tests/integration/project/elements/base/base-alpine.bst
index 6a2313018..687588f7c 100644
--- a/tests/integration/project/elements/base/base-alpine.bst
+++ b/tests/integration/project/elements/base/base-alpine.bst
@@ -7,6 +7,6 @@ description: |
sources:
- kind: tar
- url: sysroot:tarballs/integration-tests-base.v1.x86_64.tar.xz
+ url: alpine:integration-tests-base.v1.x86_64.tar.xz
base-dir: ''
ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639
diff --git a/tests/integration/project/project.conf b/tests/integration/project/project.conf
index c1a1c62ce..01c14b68d 100644
--- a/tests/integration/project/project.conf
+++ b/tests/integration/project/project.conf
@@ -2,7 +2,7 @@
name: test
element-path: elements
aliases:
- sysroot: https://gnome7.codethink.co.uk/
+ alpine: https://gnome7.codethink.co.uk/tarballs/
project_dir: file://{project_dir}
options:
linux: