diff options
| author | bschubert15 <bschubert15@bloomberg.net> | 2020-04-17 10:03:14 +0100 |
|---|---|---|
| committer | bschubert15 <bschubert15@bloomberg.net> | 2020-04-17 10:03:14 +0100 |
| commit | 04749f227b19f654f114495d6caa1c8d770be3cc (patch) | |
| tree | 05242866a6793e9c62dddd0af079a59585d11f49 | |
| parent | 33b1aa82cbb392f26a1b1f98f8cdeed80891fed5 (diff) | |
| download | buildstream-04749f227b19f654f114495d6caa1c8d770be3cc.tar.gz | |
fixup! Remove "tar" plugin
| -rw-r--r-- | src/buildstream/testing/_sourcetests/project/project.conf | 6 | ||||
| -rw-r--r-- | tests/cachekey/project/sources/tar1.bst | 5 | ||||
| -rw-r--r-- | tests/cachekey/project/sources/tar2.bst | 6 | ||||
| -rw-r--r-- | tests/cachekey/project/target.bst | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
5 files changed, 14 insertions, 7 deletions
diff --git a/src/buildstream/testing/_sourcetests/project/project.conf b/src/buildstream/testing/_sourcetests/project/project.conf index 96291e9b3..05b68bfeb 100644 --- a/src/buildstream/testing/_sourcetests/project/project.conf +++ b/src/buildstream/testing/_sourcetests/project/project.conf @@ -25,9 +25,3 @@ split-rules: fatal-warnings: - bad-element-suffix - bad-characters-in-name - -plugins: -- origin: pip - package-name: bst-plugins-experimental - sources: - tar: 0 diff --git a/tests/cachekey/project/sources/tar1.bst b/tests/cachekey/project/sources/tar1.bst new file mode 100644 index 000000000..1dbf27cd8 --- /dev/null +++ b/tests/cachekey/project/sources/tar1.bst @@ -0,0 +1,5 @@ +kind: import +sources: +- kind: tar + url: https://example.com/releases/1.4/foo-1.4.5.tar.gz + ref: 6c9f6f68a131ec6381da82f2bff978083ed7f4f7991d931bfa767b7965ebc94b diff --git a/tests/cachekey/project/sources/tar2.bst b/tests/cachekey/project/sources/tar2.bst new file mode 100644 index 000000000..e357be392 --- /dev/null +++ b/tests/cachekey/project/sources/tar2.bst @@ -0,0 +1,6 @@ +kind: import +sources: +- kind: tar + url: https://example.com/releases/1.4/foo-1.4.5.tar.gz + ref: 6c9f6f68a131ec6381da82f2bff978083ed7f4f7991d931bfa767b7965ebc94b + base-dir: src diff --git a/tests/cachekey/project/target.bst b/tests/cachekey/project/target.bst index 5d385de34..cabf3f7bf 100644 --- a/tests/cachekey/project/target.bst +++ b/tests/cachekey/project/target.bst @@ -16,6 +16,8 @@ depends: - sources/pip1.bst - sources/remote1.bst - sources/remote2.bst +- sources/tar1.bst +- sources/tar2.bst - sources/zip1.bst - sources/zip2.bst - elements/build1.bst @@ -173,7 +173,7 @@ deps = sphinx_rtd_theme >= 0.4.2 pytest -rrequirements/requirements.txt - git+https://gitlab.com/buildstream/bst-plugins-experimental.git@{env:BST_PLUGINS_EXPERIMENTAL_VERSION:{[config]BST_PLUGINS_EXPERIMENTAL_VERSION}}#egg=bst_plugins_experimental[ostree,deb,tar] + git+https://gitlab.com/buildstream/bst-plugins-experimental.git@{env:BST_PLUGINS_EXPERIMENTAL_VERSION:{[config]BST_PLUGINS_EXPERIMENTAL_VERSION}}#egg=bst_plugins_experimental[ostree,deb] passenv = BST_FORCE_SESSION_REBUILD BST_SOURCE_CACHE |