diff options
Diffstat (limited to 'integration-tests/bzr-test')
3 files changed, 28 insertions, 29 deletions
diff --git a/integration-tests/bzr-test/elements/dependencies/base-platform.bst b/integration-tests/bzr-test/elements/dependencies/base-platform.bst index 09c95acb4..66edf21ba 100644 --- a/integration-tests/bzr-test/elements/dependencies/base-platform.bst +++ b/integration-tests/bzr-test/elements/dependencies/base-platform.bst @@ -1,23 +1,19 @@ kind: import description: Import the base freedesktop platform +sources: +- kind: ostree + url: gnomesdk:repo/ + gpg-key: keys/gnome-sdk.gpg + (?): + - arch == x86_64: + track: runtime/org.freedesktop.BasePlatform/x86_64/1.4 + ref: c9d09b7250a12ef09d95952fc4f49a35e5f8c2c1dd7141b7eeada4069e6f6576 + - arch == i386: + track: runtime/org.freedesktop.BasePlatform/i386/1.4 + ref: 27ebae91839a454596a273391b0e53063eaa8aca4fc9cb64654582bfbc338c96 config: source: files public: bst: integration-commands: - ldconfig -arches: - x86_64: - sources: - - kind: ostree - url: gnomesdk:repo/ - track: runtime/org.freedesktop.BasePlatform/x86_64/1.4 - gpg-key: keys/gnome-sdk.gpg - ref: c9d09b7250a12ef09d95952fc4f49a35e5f8c2c1dd7141b7eeada4069e6f6576 - i386: - sources: - - kind: ostree - url: gnomesdk:repo/ - track: runtime/org.freedesktop.BasePlatform/i386/1.4 - gpg-key: keys/gnome-sdk.gpg - ref: 27ebae91839a454596a273391b0e53063eaa8aca4fc9cb64654582bfbc338c96 diff --git a/integration-tests/bzr-test/elements/dependencies/base-sdk.bst b/integration-tests/bzr-test/elements/dependencies/base-sdk.bst index cd191fd1b..d659a86eb 100644 --- a/integration-tests/bzr-test/elements/dependencies/base-sdk.bst +++ b/integration-tests/bzr-test/elements/dependencies/base-sdk.bst @@ -1,20 +1,16 @@ kind: import description: Import the base freedesktop SDK -config: - source: files - target: usr -arches: - x86_64: - sources: - - kind: ostree - url: gnomesdk:repo/ +sources: +- kind: ostree + url: gnomesdk:repo/ + gpg-key: keys/gnome-sdk.gpg + (?): + - arch == x86_64: track: runtime/org.freedesktop.BaseSdk/x86_64/1.4 - gpg-key: keys/gnome-sdk.gpg ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882 - i386: - sources: - - kind: ostree - url: gnomesdk:repo/ + - arch == i386: track: runtime/org.freedesktop.BaseSdk/i386/1.4 - gpg-key: keys/gnome-sdk.gpg ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981 +config: + source: files + target: usr diff --git a/integration-tests/bzr-test/project.conf b/integration-tests/bzr-test/project.conf index 4212ca3d1..46985b075 100644 --- a/integration-tests/bzr-test/project.conf +++ b/integration-tests/bzr-test/project.conf @@ -12,3 +12,10 @@ aliases: element-path: elements +options: + arch: + type: arch + description: The machine architecture + values: + - x86_64 + - i386 |