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 e7767db61331445e54651ec4da490db70856339a Author: Tristan Maat <[email protected]> AuthorDate: Tue Jun 25 11:50:05 2019 +0100 tests/*: Adjust integration tests not in the integration directory --- .../testing/_sourcetests/project/elements/base.bst | 2 +- .../_sourcetests/project/elements/base/base-alpine.bst | 17 ----------------- .../project/elements/base/base-freedesktop.bst | 17 +++++++++++++++++ .../testing/_sourcetests/project/project.conf | 2 +- tests/remoteexecution/project/elements/base.bst | 2 +- .../project/elements/base/base-alpine.bst | 17 ----------------- .../project/elements/base/base-freedesktop.bst | 17 +++++++++++++++++ tests/remoteexecution/project/project.conf | 2 +- .../sources/local/deterministic-umask/elements/base.bst | 2 +- .../deterministic-umask/elements/base/base-alpine.bst | 17 ----------------- .../elements/base/base-freedesktop.bst | 17 +++++++++++++++++ tests/sources/project/elements/base.bst | 2 +- tests/sources/project/elements/base/base-alpine.bst | 17 ----------------- .../sources/project/elements/base/base-freedesktop.bst | 17 +++++++++++++++++ 14 files changed, 74 insertions(+), 74 deletions(-) diff --git a/src/buildstream/testing/_sourcetests/project/elements/base.bst b/src/buildstream/testing/_sourcetests/project/elements/base.bst index 428afa7..91357b5 100644 --- a/src/buildstream/testing/_sourcetests/project/elements/base.bst +++ b/src/buildstream/testing/_sourcetests/project/elements/base.bst @@ -2,4 +2,4 @@ kind: stack depends: - - base/base-alpine.bst + - base/base-freedesktop.bst diff --git a/src/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst b/src/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst deleted file mode 100644 index c583309..0000000 --- a/src/buildstream/testing/_sourcetests/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/src/buildstream/testing/_sourcetests/project/elements/base/base-freedesktop.bst b/src/buildstream/testing/_sourcetests/project/elements/base/base-freedesktop.bst new file mode 100644 index 0000000..ee7e73b --- /dev/null +++ b/src/buildstream/testing/_sourcetests/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/src/buildstream/testing/_sourcetests/project/project.conf b/src/buildstream/testing/_sourcetests/project/project.conf index 05b68bf..69c142e 100644 --- a/src/buildstream/testing/_sourcetests/project/project.conf +++ b/src/buildstream/testing/_sourcetests/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/remoteexecution/project/elements/base.bst b/tests/remoteexecution/project/elements/base.bst index 428afa7..91357b5 100644 --- a/tests/remoteexecution/project/elements/base.bst +++ b/tests/remoteexecution/project/elements/base.bst @@ -2,4 +2,4 @@ kind: stack depends: - - base/base-alpine.bst + - base/base-freedesktop.bst diff --git a/tests/remoteexecution/project/elements/base/base-alpine.bst b/tests/remoteexecution/project/elements/base/base-alpine.bst deleted file mode 100644 index c583309..0000000 --- a/tests/remoteexecution/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/remoteexecution/project/elements/base/base-freedesktop.bst b/tests/remoteexecution/project/elements/base/base-freedesktop.bst new file mode 100644 index 0000000..ee7e73b --- /dev/null +++ b/tests/remoteexecution/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/remoteexecution/project/project.conf b/tests/remoteexecution/project/project.conf index ddfe47b..02c817b 100644 --- a/tests/remoteexecution/project/project.conf +++ b/tests/remoteexecution/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/sources/local/deterministic-umask/elements/base.bst b/tests/sources/local/deterministic-umask/elements/base.bst index 428afa7..91357b5 100644 --- a/tests/sources/local/deterministic-umask/elements/base.bst +++ b/tests/sources/local/deterministic-umask/elements/base.bst @@ -2,4 +2,4 @@ kind: stack depends: - - base/base-alpine.bst + - base/base-freedesktop.bst diff --git a/tests/sources/local/deterministic-umask/elements/base/base-alpine.bst b/tests/sources/local/deterministic-umask/elements/base/base-alpine.bst deleted file mode 100644 index c583309..0000000 --- a/tests/sources/local/deterministic-umask/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/sources/local/deterministic-umask/elements/base/base-freedesktop.bst b/tests/sources/local/deterministic-umask/elements/base/base-freedesktop.bst new file mode 100644 index 0000000..ee7e73b --- /dev/null +++ b/tests/sources/local/deterministic-umask/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/sources/project/elements/base.bst b/tests/sources/project/elements/base.bst index 428afa7..91357b5 100644 --- a/tests/sources/project/elements/base.bst +++ b/tests/sources/project/elements/base.bst @@ -2,4 +2,4 @@ kind: stack depends: - - base/base-alpine.bst + - base/base-freedesktop.bst diff --git a/tests/sources/project/elements/base/base-alpine.bst b/tests/sources/project/elements/base/base-alpine.bst deleted file mode 100644 index c583309..0000000 --- a/tests/sources/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/sources/project/elements/base/base-freedesktop.bst b/tests/sources/project/elements/base/base-freedesktop.bst new file mode 100644 index 0000000..ee7e73b --- /dev/null +++ b/tests/sources/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"
