You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by ju...@apache.org on 2022/02/21 19:43:49 UTC
[buildstream] branch juerg/ci updated (17aa96c -> c44b0c3)
This is an automated email from the ASF dual-hosted git repository.
juergbi pushed a change to branch juerg/ci
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
from 17aa96c .github/workflows/ci.yml: Drop push trigger, add workflow_dispatch
add 2b99a02 Merge pull request #1534 from apache/juerg/ci
add 8f896c8 setup.py: Add Python 3.10
add 821a4d2 tox.ini: Add test environment for Python 3.10
add 24bd727 .github/common.env: Update Docker images
add c552413 .github: Test on Fedora 35
add 0484eb5 NEWS: Add note about Python 3.10 support
add 0df1bfc Merge pull request #1535 from apache/juerg/python-3.10
add ad2cb8f ci: update image versions
add a9e43fe Merge pull request #1544 from abderrahim/ci-image
add 101f616 _project.py: Don't consider `remote-execution` as a valid toplevel key.
add 9680ac4 doc: Document setting up remote execution services.
add 425b1bf Merge pull request #1550 from apache/tristan/document-remote-execution-configuration
add e83b08e _frontend/cli.py: Tidy up some whitespace
add 0e16be2 doc/source/format_project.rst: Stop referring to broken link.
add 58682e6 doc/source/format_declaring.rst: Slight rewording
add 598b86b doc/source/core_plugins.rst: Amend documentation about external plugins.
add 033a669 doc: Adding initial structure for a porting guide
add c4602fc doc/source/porting_user_configuration.rst: Documenting breaking changes
add 53ff3eb doc/source/porting_command_line.rst: Documenting breaking changes
add ecfd16d doc/source/porting_project.rst: Documenting breaking changes
add db4d5ea Merge pull request #1551 from apache/tristan/porting-guide
add c7be7eb testing: Fix type annotation error that mypy didn't catch
add 1098a7b repo/*: Make the Repo implementation have the same __init__ params as Repo
add 080edb0 Merge pull request #1557 from apache/bschubert/misc-cleanups
add e29f1e5 data/projectconfig.yaml: Syncrhonize SOURCE_DATE_EPOCH
add c1376f7 Merge pull request #1558 from apache/tristan/sync-base-time-stamps
add 33efe96 COPYING: Removing LGPL v2.1
add 871ffdc Adding the ASF 2.0 LICENSE and NOTICE file
add 0038c13 Updating all copyright headers to include the ASF license blurb instead of LGPL
add 9d3f2c2 NOTICE: Adding notices about third party software bundled into BuildStream
add c2ae6d4 Merge pull request #1464 from apache/tristan/apache-license
add 3f24523 data/projectconfig.yaml: Fix previous fix of SOURCE_DATE_EPOCH
add fbf266c Merge pull request #1559 from apache/tristan/fix-timestamp-again
add 4ab6933 plugins/sources/pip.py: Whitelist python 3.9 as a valid version
add 82a8290 testing/_update_cachekeys.py: Fixed to actually work.
add 1741ea8 tests/cachekey: Updated for the recent SOURCE_DATE_EPOCH change.
add e569dc6 Merge pull request #1561 from apache/tristan/fix-cache-key-test
add 39e5821 casserver.py: Request shutdown before closing casd channel
add 3a3413d tests/testutils/artifactshare.py: Fix shutdown of test server
add baa0889 Merge pull request #1560 from apache/juerg/tests-casd-server-shutdown
add 14ccac6 _artifactcache.py: catch the correct errors
add fdc22ae _artifactcache.py: make errors raised by network operations temporary
add 220dc78 .github/common.env: Update Docker images
add 94f80b4 Merge pull request #1477 from abderrahim/pull-errors
add c20bd02 workspace.py: Move bzr specific test to the bzr source
add c6946df Merge pull request #1565 from apache/bschubert/move-test
add b191845 _frontend/status.py: use shutil.get_terminal_size()
add 2e7328c Merge pull request #1545 from abderrahim/terminal_size
add c3115ac testutils/artifactshare.py: remove the casd option
add 07252f0 casserver.py: remove ReferenceStorage
add c1b5c27 casserver.py: remove the server_main function
add a3fa795 Merge pull request #1543 from abderrahim/casserver
add 5a1b5e8 types.py: Added _SourceMirror type to represent a mirror
add 7213cd4 _project.py: Use _SourceMirror to store mirrors
add 392db0a _context.py, _project.py: Allow user configuration to override mirror definitions
add 3f27940 tests/frontend/mirror.py: Test mirrors defined in user configuration
add 2d9e0b6 doc: Document the ability to override source mirrors in user configuration
add f356a3b NEWS: Document that user configuration can now override project defined source mirrors
add 5fe6ba5 _project.py: Change get_alias_uri() -> alias_exists()
add 66f7bd4 Add fetch and track source URL policy
add f55d5b5 source.py: Remove behavior of traversing mirrors in reverse at tracking time
add 10457e1 tests/frontend/mirror.py: Test fetch source policy
add a9b2a12 doc/source/using_config.rst: Document new source URL policy configurations
add 0b6810e NEWS: Document addition of fetch/track source user configuration
add 1c72d43 Merge pull request #1537 from apache/tristan/mirrors
add 41c4bdd .github/common.env: Update Docker images
add 8c64573 Merge pull request #1571 from apache/juerg/buildbox
add bc5e84a workspace.py: Remove assumption on specific kinds to testing multiple
add ea34d5f Merge pull request #1566 from apache/bschubert/rewrite-workspace-multi-test
add 0a66564 Create process group for buildbox-casd to suppress SIGINT
add 95b0012 Merge pull request #1574 from nanonyme/nanonyme/sigint-buildbox-casd
add 83fc2d7 Do not test in deprecated fedora 33
add d508773 Merge pull request #1579 from jjardon/jjardon/fedora33_remove
add df1cffd node.pyx: Fix node composition to not leak mutable data onto targets
add ebab0cb tests/format/variables.py: Adding regression test for #1360 notparallel issue
add 90cb29f Merge pull request #1570 from apache/tristan/test-notparallel
add d5774cd Drop support for Python 3.6
add 09e1ed5 Don't run CI on ubuntu 18.04 and centos 7.7
add 69eccdb Merge pull request #1554 from abderrahim/python-3.7
new c44b0c3 Revert "Merge pull request #1570 from apache/tristan/test-notparallel"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/common.env | 6 +-
.github/compose/ci.docker-compose.yml | 18 +-
.github/run-ci.sh | 4 +-
.github/workflows/ci.yml | 4 +-
COPYING | 502 ---------------------
LICENSE | 202 +++++++++
NEWS | 10 +
NOTICE | 19 +
contrib/bst-docker-import | 19 +-
contrib/bst-here | 19 +-
doc/badges.py | 19 +-
doc/source/core_plugins.rst | 7 +-
doc/source/format_declaring.rst | 2 +-
doc/source/format_project.rst | 11 +-
doc/source/index.rst | 1 +
doc/source/main_install.rst | 2 +-
doc/source/main_porting.rst | 16 +
doc/source/main_using.rst | 1 +
doc/source/porting_command_line.rst | 173 +++++++
doc/source/porting_project.rst | 360 +++++++++++++++
doc/source/porting_user_configuration.rst | 45 ++
doc/source/using_config.rst | 108 ++++-
doc/source/using_configuring_remote_execution.rst | 67 +++
setup.py | 29 +-
src/buildstream/__init__.py | 19 +-
src/buildstream/_artifact.py | 19 +-
src/buildstream/_artifactcache.py | 59 +--
src/buildstream/_artifactelement.py | 19 +-
src/buildstream/_artifactproject.py | 19 +-
src/buildstream/_assetcache.py | 19 +-
src/buildstream/_cachekey.py | 19 +-
src/buildstream/_cas/__init__.py | 19 +-
src/buildstream/_cas/cascache.py | 19 +-
src/buildstream/_cas/casdprocessmanager.py | 33 +-
src/buildstream/_cas/casremote.py | 19 +-
src/buildstream/_cas/casserver.py | 206 +--------
src/buildstream/_context.py | 41 +-
src/buildstream/_elementproxy.py | 19 +-
src/buildstream/_elementsources.py | 19 +-
src/buildstream/_elementsourcescache.py | 19 +-
src/buildstream/_exceptions.py | 23 +-
src/buildstream/_frontend/__init__.py | 19 +-
src/buildstream/_frontend/app.py | 19 +-
src/buildstream/_frontend/cli.py | 2 +-
src/buildstream/_frontend/complete.py | 19 +-
src/buildstream/_frontend/linuxapp.py | 19 +-
src/buildstream/_frontend/profile.py | 19 +-
src/buildstream/_frontend/status.py | 24 +-
src/buildstream/_frontend/widget.py | 19 +-
src/buildstream/_gitsourcebase.py | 19 +-
src/buildstream/_loader/__init__.py | 19 +-
src/buildstream/_loader/loadcontext.py | 19 +-
src/buildstream/_loader/loadelement.pyx | 23 +-
src/buildstream/_loader/loader.py | 19 +-
src/buildstream/_loader/metasource.py | 19 +-
src/buildstream/_loader/types.py | 19 +-
src/buildstream/_message.py | 19 +-
src/buildstream/_messenger.py | 19 +-
src/buildstream/_options/__init__.py | 19 +-
src/buildstream/_options/option.py | 19 +-
src/buildstream/_options/optionarch.py | 19 +-
src/buildstream/_options/optionbool.py | 19 +-
src/buildstream/_options/optioneltmask.py | 19 +-
src/buildstream/_options/optionenum.py | 19 +-
src/buildstream/_options/optionflags.py | 19 +-
src/buildstream/_options/optionos.py | 19 +-
src/buildstream/_options/optionpool.py | 19 +-
src/buildstream/_overlapcollector.py | 19 +-
src/buildstream/_pipeline.py | 23 +-
src/buildstream/_platform/__init__.py | 19 +-
src/buildstream/_platform/platform.py | 19 +-
src/buildstream/_pluginfactory/__init__.py | 23 +-
src/buildstream/_pluginfactory/elementfactory.py | 19 +-
src/buildstream/_pluginfactory/pluginfactory.py | 19 +-
src/buildstream/_pluginfactory/pluginorigin.py | 19 +-
.../_pluginfactory/pluginoriginjunction.py | 19 +-
.../_pluginfactory/pluginoriginlocal.py | 19 +-
src/buildstream/_pluginfactory/pluginoriginpip.py | 19 +-
src/buildstream/_pluginfactory/sourcefactory.py | 19 +-
src/buildstream/_pluginproxy.py | 19 +-
src/buildstream/_profile.py | 19 +-
src/buildstream/_project.py | 103 +++--
src/buildstream/_projectrefs.py | 19 +-
.../_protos/buildstream/v2/buildstream.proto | 95 ----
.../_protos/buildstream/v2/buildstream_pb2.py | 335 --------------
.../_protos/buildstream/v2/buildstream_pb2_grpc.py | 143 ------
src/buildstream/_remote.py | 19 +-
src/buildstream/_remotespec.py | 19 +-
src/buildstream/_scheduler/__init__.py | 19 +-
src/buildstream/_scheduler/jobs/__init__.py | 19 +-
src/buildstream/_scheduler/jobs/elementjob.py | 23 +-
src/buildstream/_scheduler/jobs/job.py | 19 +-
.../_scheduler/queues/artifactpushqueue.py | 19 +-
src/buildstream/_scheduler/queues/buildqueue.py | 19 +-
src/buildstream/_scheduler/queues/fetchqueue.py | 19 +-
src/buildstream/_scheduler/queues/pullqueue.py | 19 +-
src/buildstream/_scheduler/queues/queue.py | 19 +-
.../_scheduler/queues/sourcepushqueue.py | 19 +-
src/buildstream/_scheduler/queues/trackqueue.py | 19 +-
src/buildstream/_scheduler/scheduler.py | 19 +-
src/buildstream/_signals.py | 23 +-
src/buildstream/_site.py | 19 +-
src/buildstream/_sourcecache.py | 19 +-
src/buildstream/_state.py | 19 +-
src/buildstream/_stream.py | 19 +-
src/buildstream/_types.pyx | 19 +-
src/buildstream/_utils.pyx | 19 +-
src/buildstream/_variables.pyx | 23 +-
src/buildstream/_versions.py | 19 +-
src/buildstream/_workspaces.py | 19 +-
src/buildstream/_yaml.pyx | 23 +-
src/buildstream/buildelement.py | 19 +-
src/buildstream/data/projectconfig.yaml | 4 +-
src/buildstream/data/userconfig.yaml | 22 +
src/buildstream/downloadablefilesource.py | 19 +-
src/buildstream/element.py | 19 +-
src/buildstream/exceptions.py | 19 +-
src/buildstream/node.pxd | 19 +-
src/buildstream/node.pyx | 19 +-
src/buildstream/plugin.py | 19 +-
src/buildstream/plugins/elements/autotools.py | 19 +-
src/buildstream/plugins/elements/compose.py | 19 +-
src/buildstream/plugins/elements/filter.py | 19 +-
src/buildstream/plugins/elements/import.py | 19 +-
src/buildstream/plugins/elements/junction.py | 19 +-
src/buildstream/plugins/elements/link.py | 19 +-
src/buildstream/plugins/elements/manual.py | 19 +-
src/buildstream/plugins/elements/script.py | 19 +-
src/buildstream/plugins/elements/stack.py | 19 +-
src/buildstream/plugins/sources/bzr.py | 19 +-
src/buildstream/plugins/sources/git.py | 19 +-
src/buildstream/plugins/sources/local.py | 19 +-
src/buildstream/plugins/sources/patch.py | 19 +-
src/buildstream/plugins/sources/pip.py | 20 +-
src/buildstream/plugins/sources/remote.py | 19 +-
src/buildstream/plugins/sources/tar.py | 19 +-
src/buildstream/plugins/sources/workspace.py | 19 +-
src/buildstream/plugins/sources/zip.py | 19 +-
src/buildstream/sandbox/__init__.py | 19 +-
src/buildstream/sandbox/_config.py | 19 +-
src/buildstream/sandbox/_sandboxbuildboxrun.py | 19 +-
src/buildstream/sandbox/_sandboxdummy.py | 19 +-
src/buildstream/sandbox/_sandboxreapi.py | 19 +-
src/buildstream/sandbox/_sandboxremote.py | 19 +-
src/buildstream/sandbox/sandbox.py | 19 +-
src/buildstream/scriptelement.py | 19 +-
src/buildstream/source.py | 30 +-
src/buildstream/storage/__init__.py | 19 +-
src/buildstream/storage/_casbaseddirectory.py | 19 +-
src/buildstream/storage/_filebaseddirectory.py | 19 +-
src/buildstream/storage/directory.py | 19 +-
src/buildstream/testing/__init__.py | 22 +-
src/buildstream/testing/_cachekeys.py | 19 +-
src/buildstream/testing/_fixtures.py | 19 +-
.../testing/_sourcetests/build_checkout.py | 19 +-
src/buildstream/testing/_sourcetests/conftest.py | 19 +-
src/buildstream/testing/_sourcetests/fetch.py | 19 +-
src/buildstream/testing/_sourcetests/mirror.py | 22 +-
.../testing/_sourcetests/source_determinism.py | 19 +-
src/buildstream/testing/_sourcetests/track.py | 19 +-
.../testing/_sourcetests/track_cross_junction.py | 19 +-
src/buildstream/testing/_sourcetests/utils.py | 23 +-
src/buildstream/testing/_sourcetests/workspace.py | 19 +-
src/buildstream/testing/_update_cachekeys.py | 23 +-
src/buildstream/testing/integration.py | 19 +-
src/buildstream/testing/repo.py | 19 +-
src/buildstream/testing/runcli.py | 19 +-
src/buildstream/types.py | 85 +++-
src/buildstream/utils.py | 23 +-
tests/artifactcache/expiry.py | 19 +-
tests/cachekey/project/elements/build1.expected | 2 +-
tests/cachekey/project/elements/build2.expected | 2 +-
tests/cachekey/project/elements/build3.expected | 2 +-
tests/cachekey/project/elements/compose1.expected | 2 +-
tests/cachekey/project/elements/compose2.expected | 2 +-
tests/cachekey/project/elements/compose3.expected | 2 +-
tests/cachekey/project/elements/compose4.expected | 2 +-
tests/cachekey/project/elements/compose5.expected | 2 +-
tests/cachekey/project/elements/import1.expected | 2 +-
tests/cachekey/project/elements/import2.expected | 2 +-
tests/cachekey/project/elements/import3.expected | 2 +-
tests/cachekey/project/elements/script1.expected | 2 +-
tests/cachekey/project/sources/bzr1.expected | 2 +-
tests/cachekey/project/sources/git1.expected | 2 +-
tests/cachekey/project/sources/git2.expected | 2 +-
tests/cachekey/project/sources/git3.expected | 2 +-
tests/cachekey/project/sources/local1.expected | 2 +-
tests/cachekey/project/sources/local2.expected | 2 +-
tests/cachekey/project/sources/patch1.expected | 2 +-
tests/cachekey/project/sources/patch2.expected | 2 +-
tests/cachekey/project/sources/patch3.expected | 2 +-
tests/cachekey/project/sources/pip1.expected | 2 +-
tests/cachekey/project/sources/remote1.expected | 2 +-
tests/cachekey/project/sources/remote2.expected | 2 +-
tests/cachekey/project/sources/tar1.expected | 2 +-
tests/cachekey/project/sources/tar2.expected | 2 +-
tests/cachekey/project/sources/zip1.expected | 2 +-
tests/cachekey/project/sources/zip2.expected | 2 +-
tests/cachekey/project/target.expected | 2 +-
tests/conftest.py | 19 +-
tests/frontend/artifact_delete.py | 19 +-
tests/frontend/artifact_list_contents.py | 19 +-
tests/frontend/artifact_log.py | 19 +-
tests/frontend/artifact_show.py | 19 +-
tests/frontend/large_directory.py | 19 +-
tests/frontend/mirror.py | 171 ++++++-
tests/frontend/push.py | 19 +-
tests/frontend/remote-caches.py | 19 +-
tests/frontend/workspace.py | 62 +--
tests/integration/artifact.py | 19 +-
tests/integration/cachedfail.py | 19 +-
tests/integration/messages.py | 19 +-
tests/integration/sandbox.py | 19 +-
tests/internals/storage_vdir_import.py | 19 +-
tests/plugins/sample-plugins/setup.py | 21 +-
tests/remoteexecution/buildfail.py | 19 +-
tests/remoteexecution/buildtree.py | 19 +-
tests/remoteexecution/junction.py | 19 +-
tests/sandboxes/selection.py | 19 +-
tests/sourcecache/cache.py | 19 +-
tests/sourcecache/config.py | 19 +-
tests/sourcecache/fetch.py | 19 +-
.../project/plugins/elements/always_fail.py | 19 +-
tests/sourcecache/push.py | 19 +-
tests/sourcecache/source-checkout.py | 19 +-
tests/sourcecache/staging.py | 19 +-
tests/sourcecache/workspace.py | 19 +-
tests/sources/bzr.py | 30 +-
tests/sources/git.py | 19 +-
tests/sources/keytest.py | 19 +-
tests/testutils/__init__.py | 19 +-
tests/testutils/artifactshare.py | 48 +-
tests/testutils/context.py | 19 +-
tests/testutils/filetypegenerator.py | 19 +-
tests/testutils/platform.py | 23 +-
tests/testutils/repo/bzr.py | 2 +-
tests/testutils/repo/git.py | 2 +-
tests/testutils/runner_integration.py | 19 +-
tox.ini | 38 +-
239 files changed, 3122 insertions(+), 3307 deletions(-)
delete mode 100644 COPYING
create mode 100644 LICENSE
create mode 100644 NOTICE
create mode 100644 doc/source/main_porting.rst
create mode 100644 doc/source/porting_command_line.rst
create mode 100644 doc/source/porting_project.rst
create mode 100644 doc/source/porting_user_configuration.rst
create mode 100644 doc/source/using_configuring_remote_execution.rst
delete mode 100644 src/buildstream/_protos/buildstream/v2/buildstream.proto
delete mode 100644 src/buildstream/_protos/buildstream/v2/buildstream_pb2.py
delete mode 100644 src/buildstream/_protos/buildstream/v2/buildstream_pb2_grpc.py
[buildstream] 01/01: Revert "Merge pull request #1570 from apache/tristan/test-notparallel"
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juergbi pushed a commit to branch juerg/ci
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit c44b0c3e9ac5c862d0c8151815371640f9118afe
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Mon Feb 21 20:43:21 2022 +0100
Revert "Merge pull request #1570 from apache/tristan/test-notparallel"
This reverts commit 90cb29f8533ebd119cad7ec7c241649ba8bdaede, reversing
changes made to d508773169e23754cf9f4140daae903d1755e9e5.
---
src/buildstream/node.pyx | 6 +--
tests/format/variables.py | 51 ----------------------
tests/format/variables/notparallel/notparallel.bst | 4 --
tests/format/variables/notparallel/parallel.bst | 4 --
.../format/variables/notparallel/plugins/custom.py | 12 -----
.../variables/notparallel/plugins/custom.yaml | 10 -----
tests/format/variables/notparallel/project.conf | 13 ------
7 files changed, 3 insertions(+), 97 deletions(-)
diff --git a/src/buildstream/node.pyx b/src/buildstream/node.pyx
index e10c1a2..7d65461 100644
--- a/src/buildstream/node.pyx
+++ b/src/buildstream/node.pyx
@@ -446,7 +446,7 @@ cdef class ScalarNode(Node):
self.get_provenance(),
target_value.get_provenance()))
- target.value[key] = self.clone()
+ target.value[key] = self
cdef bint _is_composite_list(self) except *:
return False
@@ -973,7 +973,7 @@ cdef class MappingNode(Node):
if self._is_composite_list():
if key not in target.value:
# Composite list clobbers empty space
- target.value[key] = self.clone()
+ target.value[key] = self
else:
target_value = target.value[key]
@@ -1420,7 +1420,7 @@ cdef class SequenceNode(Node):
(<SequenceNode> target.value[key]).value.extend(self.value)
else:
# Looks good, clobber it
- target.value[key] = self.clone()
+ target.value[key] = self
cdef bint _is_composite_list(self) except *:
return False
diff --git a/tests/format/variables.py b/tests/format/variables.py
index 0b30c66..38f3503 100644
--- a/tests/format/variables.py
+++ b/tests/format/variables.py
@@ -243,54 +243,3 @@ def test_partial_context_junctions(cli, datafiles):
result.assert_success()
result_vars = _yaml.load_data(result.output)
assert result_vars.get_str("eltvar") == "/bar/foo/baz"
-
-
-# The notparallel tests use a custom plugin which recreates a situation where
-# a plugin substitutes an environment variable with the protected %{max-jobs}
-# variable, which is set depending on whether the plugin declared notparallel.
-#
-# These are a regression test against issue #1360, where we found variable
-# substitution at the plugin default YAML was buggy when multiple instances
-# were not getting the correct results.
-#
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "notparallel"))
-def test_notparallel(cli, datafiles):
- project = str(datafiles)
-
- # Test the vars
- result = cli.run(project=project, args=["show", "--format", "%{vars}%{env}", "notparallel.bst"])
- result.assert_success()
- result_vars = _yaml.load_data(result.output)
- assert result_vars.get_str("element-name") == "notparallel.bst"
- assert result_vars.get_str("max-jobs") == "1"
- assert result_vars.get_str("MAKEFLAGS") == "-j1"
-
-
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "notparallel"))
-def test_notparallel_twice(cli, datafiles):
- project = str(datafiles)
-
- #
- # Explicitly configure default max-jobs using user configuration
- #
- cli.configure({"build": {"max-jobs": 2}})
-
- # Fetch the variables and environment of both elements, where parallel.bst depends on notparallel.bst
- result = cli.run(project=project, args=["show", "--format", "%{vars}%{env}", "parallel.bst"])
- result.assert_success()
-
- # Split on the empty line, which separates elements in bst show output
- groups = result.output.split("\n\n")
- assert len(groups) >= 2
- notparallel_vars = _yaml.load_data(groups[0])
- parallel_vars = _yaml.load_data(groups[1])
-
- # Test the first group for the expected notparallel state
- assert notparallel_vars.get_str("element-name") == "notparallel.bst"
- assert notparallel_vars.get_str("max-jobs") == "1"
- assert notparallel_vars.get_str("MAKEFLAGS") == "-j1"
-
- # Test the second group for the expected !notparallel state
- assert parallel_vars.get_str("element-name") == "parallel.bst"
- assert parallel_vars.get_str("max-jobs") == "2"
- assert parallel_vars.get_str("MAKEFLAGS") == "-j2"
diff --git a/tests/format/variables/notparallel/notparallel.bst b/tests/format/variables/notparallel/notparallel.bst
deleted file mode 100644
index a32c76f..0000000
--- a/tests/format/variables/notparallel/notparallel.bst
+++ /dev/null
@@ -1,4 +0,0 @@
-kind: custom
-
-variables:
- notparallel: true
diff --git a/tests/format/variables/notparallel/parallel.bst b/tests/format/variables/notparallel/parallel.bst
deleted file mode 100644
index fafe5b3..0000000
--- a/tests/format/variables/notparallel/parallel.bst
+++ /dev/null
@@ -1,4 +0,0 @@
-kind: custom
-
-depends:
-- notparallel.bst
diff --git a/tests/format/variables/notparallel/plugins/custom.py b/tests/format/variables/notparallel/plugins/custom.py
deleted file mode 100644
index 887645a..0000000
--- a/tests/format/variables/notparallel/plugins/custom.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from buildstream import BuildElement
-
-
-# A custom build element
-class CustomElement(BuildElement):
-
- BST_MIN_VERSION = "2.0"
-
-
-# Plugin entry point
-def setup():
- return CustomElement
diff --git a/tests/format/variables/notparallel/plugins/custom.yaml b/tests/format/variables/notparallel/plugins/custom.yaml
deleted file mode 100644
index 994678d..0000000
--- a/tests/format/variables/notparallel/plugins/custom.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This element tests an odd corner case we've discovered with
-# elements which use the `%{max-jobs}` to substitute a nocache
-# environment variable.
-#
-environment:
- MAKEFLAGS: -j%{max-jobs}
-
-environment-nocache:
-- MAKEFLAGS
diff --git a/tests/format/variables/notparallel/project.conf b/tests/format/variables/notparallel/project.conf
deleted file mode 100644
index 241a4ea..0000000
--- a/tests/format/variables/notparallel/project.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Basic project configuration that doesnt override anything
-#
-name: zebra
-min-version: 2.0
-
-variables:
- notparallel: false
-
-plugins:
-- origin: local
- path: plugins
- elements:
- - custom