This is an automated email from the ASF dual-hosted git repository. tvb pushed a commit to branch tlater/freedesktop in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 4ab04d89ae215b202df48f5ac8c390268c97b69d Author: Tristan Maat <[email protected]> AuthorDate: Fri Jun 21 16:21:02 2019 +0100 tests/integration/*: Adjust tests to use new base image --- doc/examples/developing/project.conf | 2 +- doc/examples/integration-commands/project.conf | 2 +- doc/examples/running-commands/project.conf | 2 +- tests/integration/pip_element.py | 2 +- tests/integration/project/elements/base.bst | 2 +- tests/integration/project/elements/base/base-alpine.bst | 17 ----------------- .../project/elements/base/base-freedesktop.bst | 17 +++++++++++++++++ .../project/elements/sandbox-bwrap/break-shell.bst | 2 +- .../project/elements/sandbox-bwrap/command-exit-42.bst | 2 +- tests/integration/project/project.conf | 2 +- tests/integration/shell.py | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/examples/developing/project.conf b/doc/examples/developing/project.conf index 1ae2e08..e3dfcef 100644 --- a/doc/examples/developing/project.conf +++ b/doc/examples/developing/project.conf @@ -7,6 +7,6 @@ format-version: 9 # Subdirectory where elements are stored element-path: elements -# Define an alias for our alpine tarball +# Define an alias for our freedesktop tarball aliases: alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ diff --git a/doc/examples/integration-commands/project.conf b/doc/examples/integration-commands/project.conf index 9ae5b2a..9a484de 100644 --- a/doc/examples/integration-commands/project.conf +++ b/doc/examples/integration-commands/project.conf @@ -7,6 +7,6 @@ format-version: 9 # Subdirectory where elements are stored element-path: elements -# Define an alias for our alpine tarball +# Define an alias for our freedesktop tarball aliases: alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ diff --git a/doc/examples/running-commands/project.conf b/doc/examples/running-commands/project.conf index 7127b0d..6c60e39 100644 --- a/doc/examples/running-commands/project.conf +++ b/doc/examples/running-commands/project.conf @@ -7,6 +7,6 @@ format-version: 9 # Subdirectory where elements are stored element-path: elements -# Define an alias for our alpine tarball +# Define an alias for our freedesktop tarball aliases: alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ diff --git a/tests/integration/pip_element.py b/tests/integration/pip_element.py index 91dcaa3..a6fb895 100644 --- a/tests/integration/pip_element.py +++ b/tests/integration/pip_element.py @@ -56,7 +56,7 @@ def test_pip_build(cli, datafiles): assert result.exit_code == 0 assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin', - '/usr/bin/hello', '/usr/lib/python3.6']) + '/usr/bin/hello', '/usr/lib/python3.7']) # Test running an executable built with pip diff --git a/tests/integration/project/elements/base.bst b/tests/integration/project/elements/base.bst index 428afa7..91357b5 100644 --- a/tests/integration/project/elements/base.bst +++ b/tests/integration/project/elements/base.bst @@ -2,4 +2,4 @@ kind: stack depends: - - base/base-alpine.bst + - base/base-freedesktop.bst diff --git a/tests/integration/project/elements/base/base-alpine.bst b/tests/integration/project/elements/base/base-alpine.bst deleted file mode 100644 index c583309..0000000 --- a/tests/integration/project/elements/base/base-alpine.bst +++ /dev/null @@ -1,17 +0,0 @@ -kind: import - -description: | - Alpine Linux base for tests - - Generated using the `tests/integration-tests/base/generate-base.sh` script. - -sources: - - kind: tar - base-dir: '' - (?): - - 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/elements/base/base-freedesktop.bst b/tests/integration/project/elements/base/base-freedesktop.bst new file mode 100644 index 0000000..ee7e73b --- /dev/null +++ b/tests/integration/project/elements/base/base-freedesktop.bst @@ -0,0 +1,17 @@ +kind: import + +description: | + Freedesktop-sdk base for tests + + Generated using the `tests/integration-tests/base/generate-base.sh` script. + +sources: + - kind: tar + base-dir: '' + (?): + - arch == "x86-64": + ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c + url: "freedesktop:integration-tests-base.v3.x86_64.tar.xz" + - arch == "aarch64": + ref: 93c62d0d1f400dc37db8ceee122719ffa951d929b7fad684965057ffaeaf2b73 + url: "freedesktop:integration-tests-base.v3.aarch64.tar.xz" diff --git a/tests/integration/project/elements/sandbox-bwrap/break-shell.bst b/tests/integration/project/elements/sandbox-bwrap/break-shell.bst index c93a923..97c8ce6 100644 --- a/tests/integration/project/elements/sandbox-bwrap/break-shell.bst +++ b/tests/integration/project/elements/sandbox-bwrap/break-shell.bst @@ -1,6 +1,6 @@ kind: manual depends: - - base/base-alpine.bst + - base.bst public: bst: diff --git a/tests/integration/project/elements/sandbox-bwrap/command-exit-42.bst b/tests/integration/project/elements/sandbox-bwrap/command-exit-42.bst index c633334..3f9a0b9 100644 --- a/tests/integration/project/elements/sandbox-bwrap/command-exit-42.bst +++ b/tests/integration/project/elements/sandbox-bwrap/command-exit-42.bst @@ -1,6 +1,6 @@ kind: manual depends: - - base/base-alpine.bst + - base.bst config: build-commands: diff --git a/tests/integration/project/project.conf b/tests/integration/project/project.conf index ddfe47b..02c817b 100644 --- a/tests/integration/project/project.conf +++ b/tests/integration/project/project.conf @@ -2,7 +2,7 @@ name: test element-path: elements aliases: - alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ + freedesktop: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ project_dir: file://{project_dir} options: linux: diff --git a/tests/integration/shell.py b/tests/integration/shell.py index f7de3e4..330035f 100644 --- a/tests/integration/shell.py +++ b/tests/integration/shell.py @@ -325,10 +325,10 @@ def test_workspace_visible(cli, datafiles): @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox') def test_sysroot(cli, tmpdir, datafiles): project = str(datafiles) - base_element = "base/base-alpine.bst" + base_element = "base.bst" # test element only needs to be something lightweight for this test test_element = "script/script.bst" - checkout_dir = os.path.join(str(tmpdir), 'alpine-sysroot') + checkout_dir = os.path.join(str(tmpdir), 'freedesktop-sysroot') test_file = 'hello' # Build and check out a sysroot
