GNOME.org
 

[Notes] [Git][BuildStream/buildstream][tpollard/workspacebuildtree] 70 commits: _platform: Fix get_cpu_count() with cap=None

Title: GitLab

Tom Pollard pushed to branch tpollard/workspacebuildtree at BuildStream / buildstream

Commits:

28 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -145,7 +145,8 @@ docs:
    145 145 
       stage: test
    146 146 
       script:
    147 147 
       - export BST_SOURCE_CACHE="$(pwd)/cache/integration-cache/sources"
    148 
    -  - pip3 install sphinx
    148 
    +  # Currently sphinx_rtd_theme does not support Sphinx >1.8, this breaks search functionality
    149 
    +  - pip3 install sphinx==1.7.9
    149 150 
       - pip3 install sphinx-click
    150 151 
       - pip3 install sphinx_rtd_theme
    151 152 
       - cd dist && ./unpack.sh && cd buildstream
    ... ... @@ -161,14 +162,14 @@ docs:
    161 162 
     .overnight-tests: &overnight-tests-template
    162 163 
       stage: test
    163 164 
       variables:
    164 
    -    bst_ext_url: git+https://gitlab.com/BuildStream/bst-external.git
    165 
    -    bst_ext_ref: 1d6ab71151b93c8cbc0a91a36ffe9270f3b835f1 # 0.5.1
    166 
    -    fd_sdk_ref: 88d7c22c2281b987faa02edd57df80d430eecf1f # 18.08.12
    165 
    +    BST_EXT_URL: git+https://gitlab.com/BuildStream/bst-external.git
    166 
    +    BST_EXT_REF: 1d6ab71151b93c8cbc0a91a36ffe9270f3b835f1 # 0.5.1
    167 
    +    FD_SDK_REF: 88d7c22c2281b987faa02edd57df80d430eecf1f # 18.08.11-35-g88d7c22c
    167 168 
       before_script:
    168 169 
       - (cd dist && ./unpack.sh && cd buildstream && pip3 install .)
    169 
    -  - pip3 install --user -e ${bst_ext_url}@${bst_ext_ref}#egg=bst_ext
    170 
    +  - pip3 install --user -e ${BST_EXT_URL}@${BST_EXT_REF}#egg=bst_ext
    170 171 
       - git clone https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
    171 
    -  - git -C freedesktop-sdk checkout ${fd_sdk_ref}
    172 
    +  - git -C freedesktop-sdk checkout ${FD_SDK_REF}
    172 173 
       only:
    173 174 
       - schedules
    174 175

  • CONTRIBUTING.rst
    ... ... @@ -3,72 +3,137 @@ Contributing
    3 3 
     Some tips and guidelines for developers hacking on BuildStream
    4 4
    5 5
    6 
    -Feature additions
    7 
    ------------------
    8 
    -Major feature additions should be proposed on the
    9 
    -`mailing list <https://mail.gnome.org/mailman/listinfo/buildstream-list>`_
    10 
    -before being considered for inclusion, we strongly recommend proposing
    11 
    -in advance of commencing work.
    6 
    +.. _contributing_filing_issues:
    7 
    +
    8 
    +Filing issues
    9 
    +-------------
    10 
    +If you are experiencing an issue with BuildStream, or would like to submit a patch
    11 
    +to fix an issue, then you should first search the list of `open issues <https://gitlab.com/BuildStream/buildstream/issues>`_
    12 
    +to see if the issue is already filed, and `open an issue <https://gitlab.com/BuildStream/buildstream/issues/new>`_
    13 
    +if no issue already exists.
    14 
    +
    15 
    +For policies on how to submit an issue and how to use our project labels,
    16 
    +we recommend that you read the `policies guide
    17 
    +<https://gitlab.com/BuildStream/nosoftware/alignment/blob/master/BuildStream_policies.md>`_.
    18 
    +
    19 
    +
    20 
    +.. _contributing_fixing_bugs:
    21 
    +
    22 
    +Fixing bugs
    23 
    +-----------
    24 
    +Before fixing a bug, it is preferred that an :ref:`issue be filed <contributing_filing_issues>`
    25 
    +first in order to better document the defect, however this need not be followed to the
    26 
    +letter for minor fixes.
    27 
    +
    28 
    +Patches which fix bugs should always come with a regression test.
    29 
    +
    12 30
    13 
    -If you are experiencing an issue with BuildStream or would like to submit a small patch/feature, then
    14 
    -you can `oepn an issue <https://gitlab.com/BuildStream/buildstream/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=>`_
    31 
    +.. _contributing_adding_features:
    15 32
    16 
    -For policies on how to submit and issue and how to use our project labels, we recommend that you read the `policies guide <https://gitlab.com/BuildStream/nosoftware/alignment/blob/master/BuildStream_policies.md>`_
    33 
    +Adding new features
    34 
    +-------------------
    35 
    +Feature additions should be proposed on the `mailing list
    36 
    +<https://mail.gnome.org/mailman/listinfo/buildstream-list>`_
    37 
    +before being considered for inclusion. To save time and avoid any frustration,
    38 
    +we strongly recommend proposing your new feature in advance of commencing work.
    39 
    +
    40 
    +Once consensus has been reached on the mailing list, then the proposing
    41 
    +party should :ref:`file an issue <contributing_filing_issues>` to track the
    42 
    +work. Please use the *bst_task* template for issues which represent
    43 
    +feature additions.
    17 44
    18 
    -New features must be well documented and tested either in our main
    19 
    -test suite if possible, or otherwise in the integration tests.
    45 
    +New features must be well documented and tested in our test suite.
    20 46
    21 47 
     It is expected that the individual submitting the work take ownership
    22 48 
     of their feature within BuildStream for a reasonable timeframe of at least
    23 49 
     one release cycle after their work has landed on the master branch. This is
    24 
    -to say that the submitter is expected to address and fix any side effects and
    25 
    -bugs which may have fell through the cracks in the review process, giving us
    26 
    -a reasonable timeframe for identifying these.
    50 
    +to say that the submitter is expected to address and fix any side effects,
    51 
    +bugs or regressions which may have fell through the cracks in the review
    52 
    +process, giving us a reasonable timeframe for identifying these.
    27 53
    28 54
    29 
    -Patch submissions
    30 
    ------------------
    31 
    -If you want to submit a patch, do ask for developer permissions on our
    32 
    -IRC channel first (GitLab's button also works, but you may need to
    33 
    -shout about it - we often overlook this) - for CI reasons, it's much
    34 
    -easier if patches are in branches of the main repository.
    55 
    +.. _contributing_submitting_patches:
    56 
    +
    57 
    +Submitting patches
    58 
    +------------------
    35 59
    36 
    -Branches must be submitted as merge requests in gitlab. If the branch
    37 
    -fixes an issue or is related to any issues, these issues must be mentioned
    38 
    -in the merge request or preferably the commit messages themselves.
    39 60
    61 
    +Ask for developer access
    62 
    +~~~~~~~~~~~~~~~~~~~~~~~~
    63 
    +If you want to submit a patch, do ask for developer permissions, either
    64 
    +by asking us directly on our public IRC channel (irc://irc.gnome.org/#buildstream)
    65 
    +or by visiting our `project page on GitLab <https://gitlab.com/BuildStream/buildstream>`_
    66 
    +and using the GitLab UI to ask for permission.
    67 
    +
    68 
    +This will make your contribution experience smoother, as you will not
    69 
    +need to setup any complicated CI settings, and rebasing your branch
    70 
    +against the upstream master branch will be more painless.
    71 
    +
    72 
    +
    73 
    +Branch names
    74 
    +~~~~~~~~~~~~
    40 75 
     Branch names for merge requests should be prefixed with the submitter's
    41 
    -name or nickname, e.g. ``username/implement-flying-ponies``.
    76 
    +name or nickname, followed by a forward slash, and then a descriptive
    77 
    +name. e.g.::
    42 78
    43 
    -You may open merge requests for the branches you create before you
    44 
    -are ready to have them reviewed upstream, as long as your merge request
    45 
    -is not yet ready for review then it must be prefixed with the ``WIP:``
    46 
    -identifier.
    79 
    +  username/fix-that-bug
    47 80
    81 
    +This allows us to more easily identify which branch does what and
    82 
    +belongs to whom, especially so that we can effectively cleanup stale
    83 
    +branches in the upstream repository over time.
    84 
    +
    85 
    +
    86 
    +Merge requests
    87 
    +~~~~~~~~~~~~~~
    88 
    +Once you have created a local branch, you can push it to the upstream
    89 
    +BuildStream repository using the command line::
    90 
    +
    91 
    +  git push origin username/fix-that-bug:username/fix-that-bug
    92 
    +
    93 
    +GitLab will respond to this with a message and a link to allow you to create
    94 
    +a new merge request. You can also `create a merge request for an existing branch
    95 
    +<https://gitlab.com/BuildStream/buildstream/merge_requests/new>`_.
    96 
    +
    97 
    +You may open merge requests for the branches you create before you are ready
    98 
    +to have them reviewed and considered for inclusion if you like. Until your merge
    99 
    +request is ready for review, the merge request title must be prefixed with the
    100 
    +``WIP:`` identifier.
    101 
    +
    102 
    +
    103 
    +Organized commits
    104 
    +~~~~~~~~~~~~~~~~~
    48 105 
     Submitted branches must not contain a history of the work done in the
    49 
    -feature branch. Please use git's interactive rebase feature in order to
    50 
    -compose a clean patch series suitable for submission.
    106 
    +feature branch. For example, if you had to change your approach, or
    107 
    +have a later commit which fixes something in a previous commit on your
    108 
    +branch, we do not want to include the history of how you came up with
    109 
    +your patch in the upstream master branch.
    110 
    +
    111 
    +Please use git's interactive rebase feature in order to compose a clean
    112 
    +patch series suitable for submission upstream.
    113 
    +
    114 
    +Every commit in series should pass the test suite, this is very important
    115 
    +for tracking down regressions and performing git bisections in the future.
    51 116
    52 117 
     We prefer that documentation changes be submitted in separate commits from
    53 
    -the code changes which they document, and new test cases are also preferred
    54 
    -in separate commits.
    118 
    +the code changes which they document, and newly added test cases are also
    119 
    +preferred in separate commits.
    55 120
    56 121 
     If a commit in your branch modifies behavior such that a test must also
    57 122 
     be changed to match the new behavior, then the tests should be updated
    58 
    -with the same commit. Ideally every commit in the history of master passes
    59 
    -its test cases, this makes bisections more easy to perform, but is not
    60 
    -always practical with more complex branches.
    123 
    +with the same commit, so that every commit passes it's own tests.
    61 124
    62 125
    63 126 
     Commit messages
    64 127 
     ~~~~~~~~~~~~~~~
    65 
    -Commit messages must be formatted with a brief summary line, optionally
    66 
    -followed by an empty line and then a free form detailed description of
    67 
    -the change.
    128 
    +Commit messages must be formatted with a brief summary line, followed by
    129 
    +an empty line and then a free form detailed description of the change.
    68 130
    69 131 
     The summary line must start with what changed, followed by a colon and
    70 132 
     a very brief description of the change.
    71 133
    134 
    +If the commit fixes an issue, or is related to an issue; then the issue
    135 
    +number must be referenced in the commit message.
    136 
    +
    72 137 
     **Example**::
    73 138
    74 139 
       element.py: Added the frobnicator so that foos are properly frobbed.
    ... ... @@ -77,33 +142,464 @@ a very brief description of the change.
    77 142 
       the element. Elements that are not properly frobnicated raise
    78 143 
       an error to inform the user of invalid frobnication rules.
    79 144
    145 
    +  Fixes #123
    146 
    +
    147 
    +In the case that you have a commit which necessarily modifies multiple
    148 
    +components, then the summary line should still mention generally what
    149 
    +changed (if possible), followed by a colon and a brief summary.
    150 
    +
    151 
    +In this case the free form detailed description of the change should
    152 
    +contain a bullet list describing what was changed in each component
    153 
    +separately.
    154 
    +
    155 
    +**Example**::
    156 
    +
    157 
    +  artifact cache: Fixed automatic expiry in the local cache
    80 158
    81 
    -Coding style
    82 
    -------------
    83 
    -Coding style details for BuildStream
    159 
    +    o _artifactcache/artifactcache.py: Updated the API contract
    160 
    +      of ArtifactCache.remove() so that something detailed is
    161 
    +      explained here.
    84 162
    163 
    +    o _artifactcache/cascache.py: Adhere to the new API contract
    164 
    +      dictated by the abstract ArtifactCache class.
    85 165
    86 
    -Style guide
    87 
    -~~~~~~~~~~~
    88 
    -Python coding style for BuildStream is pep8, which is documented here: https://www.python.org/dev/peps/pep-0008/
    166 
    +    o tests/artifactcache/expiry.py: Modified test expectations to
    167 
    +      match the new behavior.
    168 
    +
    169 
    +  This is a part of #123
    170 
    +
    171 
    +
    172 
    +Coding guidelines
    173 
    +-----------------
    174 
    +This section discusses coding style and other guidelines for hacking
    175 
    +on BuildStream. This is important to read through for writing any non-trivial
    176 
    +patches and especially outlines what people should watch out for when
    177 
    +reviewing patches.
    178 
    +
    179 
    +Much of the rationale behind what is layed out in this section considers
    180 
    +good traceability of lines of code with *git blame*, overall sensible
    181 
    +modular structure, consistency in how we write code, and long term maintenance
    182 
    +in mind.
    183 
    +
    184 
    +
    185 
    +Approximate PEP-8 Style
    186 
    +~~~~~~~~~~~~~~~~~~~~~~~
    187 
    +Python coding style for BuildStream is approximately `pep8 <https://www.python.org/dev/peps/pep-0008/>`_.
    89 188
    90 189 
     We have a couple of minor exceptions to this standard, we dont want to compromise
    91 190 
     code readability by being overly restrictive on line length for instance.
    92 191
    93 
    -The pep8 linter will run automatically when running the test suite.
    192 
    +The pep8 linter will run automatically when :ref:`running the test suite <contributing_testing>`.
    193 
    +
    194 
    +
    195 
    +Line lengths
    196 
    +''''''''''''
    197 
    +Regarding laxness on the line length in our linter settings, it should be clarified
    198 
    +that the line length limit is a hard limit which causes the linter to bail out
    199 
    +and reject commits which break the high limit - not an invitation to write exceedingly
    200 
    +long lines of code, comments, or API documenting docstrings.
    201 
    +
    202 
    +Code, comments and docstrings should strive to remain written for approximately 80
    203 
    +or 90 character lines, where exceptions can be made when code would be less readable
    204 
    +when exceeding 80 or 90 characters (often this happens in conditional statements
    205 
    +when raising an exception, for example). Or, when comments contain a long link that
    206 
    +causes the given line to to exceed 80 or 90 characters, we don't want this to cause
    207 
    +the linter to refuse the commit.
    208 
    +
    209 
    +
    210 
    +.. _contributing_documenting_symbols:
    211 
    +
    212 
    +Documenting symbols
    213 
    +~~~~~~~~~~~~~~~~~~~
    214 
    +In BuildStream, we maintain what we call a *"Public API Surface"* that
    215 
    +is guaranteed to be stable and unchanging across stable releases. The
    216 
    +symbols which fall into this special class are documented using Python's
    217 
    +standard *docstrings*, while all other internals of BuildStream are documented
    218 
    +with comments above the related symbol.
    219 
    +
    220 
    +When documenting the public API surface which is rendered in the reference
    221 
    +manual, we always mention the major version in which the API was introduced,
    222 
    +as shown in the examples below. If a public API exists without the *Since*
    223 
    +annotation, this is taken to mean that it was available since the first stable
    224 
    +release 1.0.
    225 
    +
    226 
    +Here are some examples to get the hang of the format of API documenting
    227 
    +comments and docstrings.
    228 
    +
    229 
    +**Public API Surface method**::
    230 
    +
    231 
    +  def frobnicate(self, source, *, frobilicious=False):
    232 
    +      """Frobnicates this element with the specified source
    233 
    +
    234 
    +      Args:
    235 
    +         source (Source): The Source to frobnicate with
    236 
    +         frobilicious (bool): Optionally specify that frobnication should be
    237 
    +                              performed fribiliciously
    238 
    +
    239 
    +      Returns:
    240 
    +         (Element): The frobnicated version of this Element.
    241 
    +
    242 
    +      *Since: 1.2*
    243 
    +      """
    244 
    +      ...
    245 
    +
    246 
    +**Internal method**::
    247 
    +
    248 
    +  # frobnicate():
    249 
    +  #
    250 
    +  # Frobnicates this element with the specified source
    251 
    +  #
    252 
    +  # Args:
    253 
    +  #    source (Source): The Source to frobnicate with
    254 
    +  #    frobilicious (bool): Optionally specify that frobnication should be
    255 
    +  #                         performed fribiliciously
    256 
    +  #
    257 
    +  # Returns:
    258 
    +  #    (Element): The frobnicated version of this Element.
    259 
    +  #
    260 
    +  def frobnicate(self, source, *, frobilicious=False):
    261 
    +      ...
    262 
    +
    263 
    +**Public API Surface instance variable**::
    264 
    +
    265 
    +  def __init__(self, context, element):
    266 
    +
    267 
    +    self.name = self._compute_name(context, element)
    268 
    +    """The name of this foo
    269 
    +
    270 
    +    *Since: 1.2*
    271 
    +    """
    272 
    +
    273 
    +.. note::
    274 
    +
    275 
    +   Python does not support docstrings on instance variables, but sphinx does
    276 
    +   pick them up and includes them in the generated documentation.
    277 
    +
    278 
    +**Internal instance variable**::
    279 
    +
    280 
    +  def __init__(self, context, element):
    281 
    +
    282 
    +    self.name = self._compute_name(context, element) # The name of this foo
    283 
    +
    284 
    +**Internal instance variable (long)**::
    285 
    +
    286 
    +  def __init__(self, context, element):
    287 
    +
    288 
    +    # This instance variable required a longer explanation, so
    289 
    +    # it is on a line above the instance variable declaration.
    290 
    +    self.name = self._compute_name(context, element)
    291 
    +
    292 
    +
    293 
    +**Public API Surface class**::
    294 
    +
    295 
    +  class Foo(Bar):
    296 
    +      """The main Foo object in the data model
    297 
    +
    298 
    +      Explanation about Foo. Note that we always document
    299 
    +      the constructor arguments here, and not beside the __init__
    300 
    +      method.
    301 
    +
    302 
    +      Args:
    303 
    +         context (Context): The invocation Context
    304 
    +         count (int): The number to count
    305 
    +
    306 
    +      *Since: 1.2*
    307 
    +      """
    308 
    +      ...
    309 
    +
    310 
    +**Internal class**::
    311 
    +
    312 
    +  # Foo()
    313 
    +  #
    314 
    +  # The main Foo object in the data model
    315 
    +  #
    316 
    +  # Args:
    317 
    +  #    context (Context): The invocation Context
    318 
    +  #    count (int): The number to count
    319 
    +  #
    320 
    +  class Foo(Bar):
    321 
    +      ...
    322 
    +
    323 
    +
    324 
    +.. _contributing_class_order:
    325 
    +
    326 
    +Class structure and ordering
    327 
    +~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    328 
    +When creating or modifying an object class in BuildStream, it is
    329 
    +important to keep in mind the order in which symbols should appear
    330 
    +and keep this consistent.
    331 
    +
    332 
    +Here is an example to illustrate the expected ordering of symbols
    333 
    +on a Python class in BuildStream::
    334 
    +
    335 
    +  class Foo(Bar):
    336 
    +
    337 
    +      # Public class-wide variables come first, if any.
    338 
    +
    339 
    +      # Private class-wide variables, if any
    340 
    +
    341 
    +      # Now we have the dunder/magic methods, always starting
    342 
    +      # with the __init__() method.
    343 
    +
    344 
    +      def __init__(self, name):
    345 
    +
    346 
    +          super().__init__()
    347 
    +
    348 
    +          # NOTE: In the instance initializer we declare any instance variables,
    349 
    +          #       always declare the public instance variables (if any) before
    350 
    +          #       the private ones.
    351 
    +          #
    352 
    +          #       It is preferred to avoid any public instance variables, and
    353 
    +          #       always expose an accessor method for it instead.
    354 
    +
    355 
    +          #
    356 
    +          # Public instance variables
    357 
    +          #
    358 
    +          self.name = name  # The name of this foo
    359 
    +
    360 
    +          #
    361 
    +          # Private instance variables
    362 
    +          #
    363 
    +          self._count = 0   # The count of this foo
    364 
    +
    365 
    +      ################################################
    366 
    +      #               Abstract Methods               #
    367 
    +      ################################################
    368 
    +
    369 
    +      # NOTE: Abstract methods in BuildStream are allowed to have
    370 
    +      #       default methods.
    371 
    +      #
    372 
    +      #       Subclasses must NEVER override any method which was
    373 
    +      #       not advertized as an abstract method by the parent class.
    374 
    +
    375 
    +      # frob()
    376 
    +      #
    377 
    +      # Implementors should implement this to frob this foo
    378 
    +      # count times if possible.
    379 
    +      #
    380 
    +      # Args:
    381 
    +      #    count (int): The number of times to frob this foo
    382 
    +      #
    383 
    +      # Returns:
    384 
    +      #    (int): The number of times this foo was frobbed.
    385 
    +      #
    386 
    +      # Raises:
    387 
    +      #    (FooError): Implementors are expected to raise this error
    388 
    +      #
    389 
    +      def frob(self, count):
    390 
    +
    391 
    +          #
    392 
    +          # An abstract method in BuildStream is allowed to have
    393 
    +          # a default implementation.
    394 
    +          #
    395 
    +          self._count = self._do_frobbing(count)
    396 
    +
    397 
    +          return self._count
    398 
    +
    399 
    +      ################################################
    400 
    +      #     Implementation of abstract methods       #
    401 
    +      ################################################
    402 
    +
    403 
    +      # NOTE: Implementations of abstract methods defined by
    404 
    +      #       the parent class should NEVER document the API
    405 
    +      #       here redundantly.
    406 
    +
    407 
    +      def frobbish(self):
    408 
    +         #
    409 
    +         # Implementation of the "frobbish" abstract method
    410 
    +         # defined by the parent Bar class.
    411 
    +         #
    412 
    +         return True
    413 
    +
    414 
    +      ################################################
    415 
    +      #                 Public Methods               #
    416 
    +      ################################################
    417 
    +
    418 
    +      # NOTE: Public methods here are the ones which are expected
    419 
    +      #       to be called from outside of this class.
    420 
    +      #
    421 
    +      #       These, along with any abstract methods, usually
    422 
    +      #       constitute the API surface of this class.
    423 
    +
    424 
    +      # frobnicate()
    425 
    +      #
    426 
    +      # Perform the frobnication process on this Foo
    427 
    +      #
    428 
    +      # Raises:
    429 
    +      #    (FrobError): In the case that a frobnication error was
    430 
    +      #                 encountered
    431 
    +      #
    432 
    +      def frobnicate(self):
    433 
    +          frobnicator.frobnicate(self)
    434 
    +
    435 
    +      # set_count()
    436 
    +      #
    437 
    +      # Sets the count of this foo
    438 
    +      #
    439 
    +      # Args:
    440 
    +      #    count (int): The new count to set
    441 
    +      #
    442 
    +      def set_count(self, count):
    443 
    +
    444 
    +          self._count = count
    445 
    +
    446 
    +      # get_count()
    447 
    +      #
    448 
    +      # Accessor for the count value of this foo.
    449 
    +      #
    450 
    +      # Returns:
    451 
    +      #    (int): The count of this foo
    452 
    +      #
    453 
    +      def get_count(self, count):
    454 
    +
    455 
    +          return self._count
    456 
    +
    457 
    +      ################################################
    458 
    +      #                 Private Methods              #
    459 
    +      ################################################
    460 
    +
    461 
    +      # NOTE: Private methods are the ones which are internal
    462 
    +      #       implementation details of this class.
    463 
    +      #
    464 
    +      #       Even though these are private implementation
    465 
    +      #       details, they still MUST have API documenting
    466 
    +      #       comments on them.
    467 
    +
    468 
    +      # _do_frobbing()
    469 
    +      #
    470 
    +      # Does the actual frobbing
    471 
    +      #
    472 
    +      # Args:
    473 
    +      #    count (int): The number of times to frob this foo
    474 
    +      #
    475 
    +      # Returns:
    476 
    +      #    (int): The number of times this foo was frobbed.
    477 
    +      #
    478 
    +      def self._do_frobbing(self, count):
    479 
    +          return count
    480 
    +
    481 
    +
    482 
    +.. _contributing_public_and_private:
    483 
    +
    484 
    +Public and private symbols
    485 
    +~~~~~~~~~~~~~~~~~~~~~~~~~~
    486 
    +BuildStream mostly follows the PEP-8 for defining *public* and *private* symbols
    487 
    +for any given class, with some deviations. Please read the `section on inheritance
    488 
    +<https://www.python.org/dev/peps/pep-0008/#designing-for-inheritance>`_ for
    489 
    +reference on how the PEP-8 defines public and non-public.
    490 
    +
    491 
    +* A *public* symbol is any symbol which you expect to be used by clients
    492 
    +  of your class or module within BuildStream.
    493 
    +
    494 
    +  Public symbols are written without any leading underscores.
    495 
    +
    496 
    +* A *private* symbol is any symbol which is entirely internal to your class
    497 
    +  or module within BuildStream. These symbols cannot ever be accessed by
    498 
    +  external clients or modules.
    499 
    +
    500 
    +  A private symbol must be denoted by a leading underscore.
    501 
    +
    502 
    +* When a class can have subclasses, then private symbols should be denoted
    503 
    +  by two leading underscores. For example, the ``Sandbox`` or ``Platform``
    504 
    +  classes which have various implementations, or the ``Element`` and ``Source``
    505 
    +  classes which plugins derive from.
    506 
    +
    507 
    +  The double leading underscore naming convention invokes Python's name
    508 
    +  mangling algorithm which helps prevent namespace collisions in the case
    509 
    +  that subclasses might have a private symbol with the same name.
    510 
    +
    511 
    +In BuildStream, we have what we call a *"Public API Surface"*, as previously
    512 
    +mentioned in :ref:`contributing_documenting_symbols`. In the :ref:`next section
    513 
    +<contributing_public_api_surface>` we will discuss the *"Public API Surface"* and
    514 
    +outline the exceptions to the rules discussed here.
    515 
    +
    516 
    +
    517 
    +.. _contributing_public_api_surface:
    518 
    +
    519 
    +Public API surface
    520 
    +~~~~~~~~~~~~~~~~~~
    521 
    +BuildStream exposes what we call a *"Public API Surface"* which is stable
    522 
    +and unchanging. This is for the sake of stability of the interfaces which
    523 
    +plugins use, so it can also be referred to as the *"Plugin facing API"*.
    524 
    +
    525 
    +Any symbols which are a part of the *"Public API Surface*" are never allowed
    526 
    +to change once they have landed in a stable release version of BuildStream. As
    527 
    +such, we aim to keep the *"Public API Surface"* as small as possible at all
    528 
    +times, and never expose any internal details to plugins inadvertently.
    529 
    +
    530 
    +One problem which arises from this is that we end up having symbols
    531 
    +which are *public* according to the :ref:`rules discussed in the previous section
    532 
    +<contributing_public_and_private>`, but must be hidden away from the
    533 
    +*"Public API Surface"*. For example, BuildStream internal classes need
    534 
    +to invoke methods on the ``Element`` and ``Source`` classes, wheras these
    535 
    +methods need to be hidden from the *"Public API Surface"*.
    536 
    +
    537 
    +This is where BuildStream deviates from the PEP-8 standard for public
    538 
    +and private symbol naming.
    539 
    +
    540 
    +In order to disambiguate between:
    541 
    +
    542 
    +* Symbols which are publicly accessible details of the ``Element`` class, can
    543 
    +  be accessed by BuildStream internals, but must remain hidden from the
    544 
    +  *"Public API Surface"*.
    545 
    +
    546 
    +* Symbols which are private to the ``Element`` class, and cannot be accessed
    547 
    +  from outside of the ``Element`` class at all.
    548 
    +
    549 
    +We denote the former category of symbols with only a single underscore, and the latter
    550 
    +category of symbols with a double underscore. We often refer to this distinction
    551 
    +as *"API Private"* (the former category) and *"Local Private"* (the latter category).
    552 
    +
    553 
    +Classes which are a part of the *"Public API Surface"* and require this disambiguation
    554 
    +were not discussed in :ref:`the class ordering section <contributing_class_order>`, for
    555 
    +these classes, the *"API Private"* symbols always come **before** the *"Local Private"*
    556 
    +symbols in the class declaration.
    557 
    +
    558 
    +Modules which are not a part of the *"Public API Surface"* have their Python files
    559 
    +prefixed with a single underscore, and are not imported in BuildStream's the master
    560 
    +``__init__.py`` which is used by plugins.
    561 
    +
    562 
    +.. note::
    563 
    +
    564 
    +   The ``utils.py`` module is public and exposes a handful of utility functions,
    565 
    +   however many of the functions it provides are *"API Private"*.
    566 
    +
    567 
    +   In this case, the *"API Private"* functions are prefixed with a single underscore.
    568 
    +
    569 
    +Any objects which are a part of the *"Public API Surface"* should be exposed via the
    570 
    +toplevel ``__init__.py`` of the ``buildstream`` package.
    571 
    +
    572 
    +
    573 
    +File naming convention
    574 
    +~~~~~~~~~~~~~~~~~~~~~~
    575 
    +With the exception of a few helper objects and data structures, we structure
    576 
    +the code in BuildStream such that every filename is named after the object it
    577 
    +implements. E.g. The ``Project`` object is implemented in ``_project.py``, the
    578 
    +``Context`` object in ``_context.py``, the base ``Element`` class in ``element.py``,
    579 
    +etc.
    580 
    +
    581 
    +As mentioned in the previous section, objects which are not a part of the
    582 
    +:ref:`public, plugin facing API surface <contributing_public_api_surface>` have their
    583 
    +filenames prefixed with a leading underscore (like ``_context.py`` and ``_project.py``
    584 
    +in the examples above).
    585 
    +
    586 
    +When an object name has multiple words in it, e.g. ``ArtifactCache``, then the
    587 
    +resulting file is named all in lower case without any underscore to separate
    588 
    +words. In the case of ``ArtifactCache``, the filename implementing this object
    589 
    +is found at ``_artifactcache/artifactcache.py``.
    94 590
    95 591
    96 592 
     Imports
    97 593 
     ~~~~~~~
    98 
    -Module imports inside BuildStream are done with relative ``.`` notation
    594 
    +Module imports inside BuildStream are done with relative ``.`` notation:
    99 595
    100 
    -Good::
    596 
    +**Good**::
    101 597
    102 
    -  from .context import Context
    598 
    +  from ._context import Context
    103 599
    104 
    -Bad::
    600 
    +**Bad**::
    105 601
    106 
    -  from buildstream.context import Context
    602 
    +  from buildstream._context import Context
    107 603
    108 604 
     The exception to the above rule is when authoring plugins,
    109 605 
     plugins do not reside in the same namespace so they must
    ... ... @@ -122,128 +618,586 @@ This makes things clear when reading code that said functions
    122 618 
     are not defined in the same file but come from utils.py for example.
    123 619
    124 620
    125 
    -Policy for private symbols
    126 
    -~~~~~~~~~~~~~~~~~~~~~~~~~~
    127 
    -Private symbols are expressed via a leading ``_`` single underscore, or
    128 
    -in some special circumstances with a leading ``__`` double underscore.
    621 
    +.. _contributing_instance_variables:
    622 
    +
    623 
    +Instance variables
    624 
    +~~~~~~~~~~~~~~~~~~
    625 
    +It is preferred that all instance state variables be declared as :ref:`private symbols
    626 
    +<contributing_public_and_private>`, however in some cases, especially when the state
    627 
    +is immutable for the object's life time (like an ``Element`` name for example), it
    628 
    +is acceptable to save some typing by using a publicly accessible instance variable.
    629 
    +
    630 
    +It is never acceptable to modify the value of an instance variable from outside
    631 
    +of the declaring class, even if the variable is *public*. In other words, the class
    632 
    +which exposes an instance variable is the only one in control of the value of this
    633 
    +variable.
    634 
    +
    635 
    +* If an instance variable is public and must be modified; then it must be
    636 
    +  modified using a :ref:`mutator <contributing_accessor_mutator>`.
    637 
    +
    638 
    +* Ideally for better encapsulation, all object state is declared as
    639 
    +  :ref:`private instance variables <contributing_public_and_private>` and can
    640 
    +  only be accessed by external classes via public :ref:`accessors and mutators
    641 
    +  <contributing_accessor_mutator>`.
    642 
    +
    643 
    +.. note::
    644 
    +
    645 
    +   In some cases, we may use small data structures declared as objects for the sake
    646 
    +   of better readability, where the object class itself has no real supporting code.
    647 
    +
    648 
    +   In these exceptions, it can be acceptable to modify the instance variables
    649 
    +   of these objects directly, unless they are otherwise documented to be immutable.
    650 
    +
    651 
    +
    652 
    +.. _contributing_accessor_mutator:
    653 
    +
    654 
    +Accessors and mutators
    655 
    +~~~~~~~~~~~~~~~~~~~~~~
    656 
    +An accessor and mutator, are methods defined on the object class to access (get)
    657 
    +or mutate (set) a value owned by the declaring class, respectively.
    658 
    +
    659 
    +An accessor might derive the returned value from one or more of its components,
    660 
    +and a mutator might have side effects, or delegate the mutation to a component.
    661 
    +
    662 
    +Accessors and mutators are always :ref:`public <contributing_public_and_private>`
    663 
    +(even if they might have a single leading underscore and are considered
    664 
    +:ref:`API Private <contributing_public_api_surface>`), as their purpose is to
    665 
    +enforce encapsulation with regards to any accesses to the state which is owned
    666 
    +by the declaring class.
    667 
    +
    668 
    +Accessors and mutators are functions prefixed with ``get_`` and ``set_``
    669 
    +respectively, e.g.::
    670 
    +
    671 
    +  class Foo():
    672 
    +
    673 
    +      def __init__(self):
    674 
    +
    675 
    +          # Declare some internal state
    676 
    +          self._count = 0
    677 
    +
    678 
    +      # get_count()
    679 
    +      #
    680 
    +      # Gets the count of this Foo.
    681 
    +      #
    682 
    +      # Returns:
    683 
    +      #    (int): The current count of this Foo
    684 
    +      #
    685 
    +      def get_foo(self):
    686 
    +          return self._count
    687 
    +
    688 
    +      # set_count()
    689 
    +      #
    690 
    +      # Sets the count of this Foo.
    691 
    +      #
    692 
    +      # Args:
    693 
    +      #    count (int): The new count for this Foo
    694 
    +      #
    695 
    +      def set_foo(self, count):
    696 
    +          self._count = count
    697 
    +
    698 
    +.. attention::
    129 699
    130 
    -Before understanding the naming policy, it is first important to understand
    131 
    -that in BuildStream, there are two levels of privateness which need to be
    132 
    -considered.
    700 
    +   We are aware that Python offers a facility for accessors and
    701 
    +   mutators using the ``@property`` decorator instead. Do not use
    702 
    +   the ``@property`` decorator.
    133 703
    134 
    -These are treated subtly differently and thus need to be understood:
    704 
    +   The decision to use explicitly defined functions instead of the
    705 
    +   ``@property`` decorator is rather arbitrary, there is not much
    706 
    +   technical merit to preferring one technique over the other.
    707 
    +   However as :ref:`discussed below <contributing_always_consistent>`,
    708 
    +   it is of the utmost importance that we do not mix both techniques
    709 
    +   in the same codebase.
    135 710
    136 
    -* API Private
    137 711
    138 
    -  A symbol is considered to be *API private* if it is not exposed in the *public API*.
    712 
    +.. _contributing_abstract_methods:
    139 713
    140 
    -  Even if a symbol does not have any leading underscore, it may still be *API private*
    141 
    -  if the containing *class* or *module* is named with a leading underscore.
    714 
    +Abstract methods
    715 
    +~~~~~~~~~~~~~~~~
    716 
    +In BuildStream, an *"Abstract Method"* is a bit of a misnomer and does
    717 
    +not match up to how Python defines abstract methods, we need to seek out
    718 
    +a new nomanclature to refer to these methods.
    142 719
    143 
    -* Local private
    720 
    +In Python, an *"Abstract Method"* is a method which **must** be
    721 
    +implemented by a subclass, whereas all methods in Python can be
    722 
    +overridden.
    144 723
    145 
    -  A symbol is considered to be *local private* if it is not intended for access
    146 
    -  outside of the defining *scope*.
    724 
    +In BuildStream, we use the term *"Abstract Method"*, to refer to
    725 
    +a method which **can** be overridden by a subclass, whereas it
    726 
    +is **illegal** to override any other method.
    147 727
    148 
    -  If a symbol has a leading underscore, it might not be *local private* if it is
    149 
    -  declared on a publicly visible class, but needs to be accessed internally by
    150 
    -  other modules in the BuildStream core.
    728 
    +* Abstract methods are allowed to have default implementations.
    151 729
    730 
    +* Subclasses are not allowed to redefine the calling signature
    731 
    +  of an abstract method, or redefine the API contract in any way.
    152 732
    153 
    -Ordering
    154 
    -''''''''
    155 
    -For better readability and consistency, we try to keep private symbols below
    156 
    -public symbols. In the case of public modules where we may have a mix of
    157 
    -*API private* and *local private* symbols, *API private* symbols should come
    158 
    -before *local private* symbols.
    733 
    +* Subclasses are not allowed to override any other methods.
    159 734
    735 
    +The key here is that in BuildStream, we consider it unacceptable
    736 
    +that a subclass overrides a method of it's parent class unless
    737 
    +the said parent class has explicitly given permission to subclasses
    738 
    +to do so, and outlined the API contract for this purpose. No surprises
    739 
    +are allowed.
    160 740
    161 
    -Symbol naming
    162 
    -'''''''''''''
    163 
    -Any private symbol must start with a single leading underscore for two reasons:
    164 741
    165 
    -* So that it does not bleed into documentation and *public API*.
    742 
    +Error handling
    743 
    +~~~~~~~~~~~~~~
    744 
    +In BuildStream, all non recoverable errors are expressed via
    745 
    +subclasses of the ``BstError`` exception.
    166 746
    167 
    -* So that it is clear to developers which symbols are not used outside of the declaring *scope*
    747 
    +This exception is handled deep in the core in a few places, and
    748 
    +it is rarely necessary to handle a ``BstError``.
    168 749
    169 
    -Remember that with python, the modules (python files) are also symbols
    170 
    -within their containing *package*, as such; modules which are entirely
    171 
    -private to BuildStream are named as such, e.g. ``_thismodule.py``.
    172 750
    751 
    +Raising exceptions
    752 
    +''''''''''''''''''
    753 
    +When writing code in the BuildStream core, ensure that all system
    754 
    +calls and third party library calls are wrapped in a ``try:`` block,
    755 
    +and raise a descriptive ``BstError`` of the appropriate class explaining
    756 
    +what exactly failed.
    173 757
    174 
    -Cases for double underscores
    175 
    -''''''''''''''''''''''''''''
    176 
    -The double underscore in python has a special function. When declaring
    177 
    -a symbol in class scope which has a leading underscore, it can only be
    178 
    -accessed within the class scope using the same name. Outside of class
    179 
    -scope, it can only be accessed with a *cheat*.
    758 
    +Ensure that the original system call error is formatted into your new
    759 
    +exception, and that you use the Python ``from`` semantic to retain the
    760 
    +original call trace, example::
    180 761
    181 
    -We use the double underscore in cases where the type of privateness can be
    182 
    -ambiguous.
    762 
    +  try:
    763 
    +      os.utime(self._refpath(ref))
    764 
    +  except FileNotFoundError as e:
    765 
    +      raise ArtifactError("Attempt to access unavailable artifact: {}".format(e)) from e
    183 766
    184 
    -* For private modules and classes
    185 767
    186 
    -  We never need to disambiguate with a double underscore
    768 
    +Enhancing exceptions
    769 
    +''''''''''''''''''''
    770 
    +Sometimes the ``BstError`` originates from a lower level component,
    771 
    +and the code segment which raised the exception did not have enough context
    772 
    +to create a complete, informative summary of the error for the user.
    187 773
    188 
    -* For private symbols declared in a public *scope*
    774 
    +In these cases it is necessary to handle the error and raise a new
    775 
    +one, e.g.::
    189 776
    190 
    -  In the case that we declare a private method on a public object, it
    191 
    -  becomes ambiguous whether:
    777 
    +  try:
    778 
    +      extracted_artifact = self._artifacts.extract(self, cache_key)
    779 
    +  except ArtifactError as e:
    780 
    +      raise ElementError("Failed to extract {} while checking out {}: {}"
    781 
    +                         .format(cache_key, self.name, e)) from e
    192 782
    193 
    -  * The symbol is *local private*, and only used within the given scope
    194 783
    195 
    -  * The symbol is *API private*, and will be used internally by BuildStream
    196 
    -    from other parts of the codebase.
    784 
    +Programming errors
    785 
    +''''''''''''''''''
    786 
    +Sometimes you are writing code and have detected an unexpected condition,
    787 
    +or a broken invariant for which the code cannot be prepared to handle
    788 
    +gracefully.
    197 789
    198 
    -  In this case, we use a single underscore for *API private* methods which
    199 
    -  are not *local private*, and we use a double underscore for *local private*
    200 
    -  methods declared in public scope.
    790 
    +In these cases, do **not** raise any of the ``BstError`` class exceptions.
    201 791
    792 
    +Instead, use the ``assert`` statement, e.g.::
    202 793
    203 
    -Documenting private symbols
    204 
    -'''''''''''''''''''''''''''
    205 
    -Any symbol which is *API Private* (regardless of whether it is also
    206 
    -*local private*), should have some documentation for developers to
    207 
    -better understand the codebase.
    794 
    +  assert utils._is_main_process(), \
    795 
    +      "Attempted to save workspace configuration from child process"
    208 796
    209 
    -Contrary to many other python projects, we do not use docstrings to
    210 
    -document private symbols, but prefer to keep *API Private* symbols
    211 
    -documented in code comments placed *above* the symbol (or *beside* the
    212 
    -symbol in some cases, such as variable declarations in a class where
    213 
    -a shorter comment is more desirable), rather than docstrings placed *below*
    214 
    -the symbols being documented.
    797 
    +This will result in a ``BUG`` message with the stack trace included being
    798 
    +logged and reported in the frontend.
    215 799
    216 
    -Other than this detail, follow the same guidelines for documenting
    217 
    -symbols as described below.
    218 800
    801 
    +BstError parameters
    802 
    +'''''''''''''''''''
    803 
    +When raising ``BstError`` class exceptions, there are some common properties
    804 
    +which can be useful to know about:
    219 805
    220 
    -Documenting BuildStream
    221 
    ------------------------
    806 
    +* **message:** The brief human readable error, will be formatted on one line in the frontend.
    807 
    +
    808 
    +* **detail:** An optional detailed human readable message to accompany the **message** summary
    809 
    +  of the error. This is often used to recommend the user some course of action, or to provide
    810 
    +  additional context about the error.
    811 
    +
    812 
    +* **temporary:** Some errors are allowed to be *temporary*, this attribute is only
    813 
    +  observed from child processes which fail in a temporary way. This distinction
    814 
    +  is used to determine whether the task should be *retried* or not. An error is usually
    815 
    +  only a *temporary* error if the cause of the error was a network timeout.
    816 
    +
    817 
    +* **reason:** A machine readable identifier for the error. This is used for the purpose
    818 
    +  of regression testing, such that we check that BuildStream has errored out for the
    819 
    +  expected reason in a given failure mode.
    820 
    +
    821 
    +
    822 
    +Documenting Exceptions
    823 
    +''''''''''''''''''''''
    824 
    +We have already seen :ref:`some examples <contributing_class_order>` of how
    825 
    +exceptions are documented in API documenting comments, but this is worth some
    826 
    +additional disambiguation.
    827 
    +
    828 
    +* Only document the exceptions which are raised directly by the function in question.
    829 
    +  It is otherwise nearly impossible to keep track of what exceptions *might* be raised
    830 
    +  indirectly by calling the given function.
    831 
    +
    832 
    +* For a regular public or private method, your audience is a caller of the function;
    833 
    +  document the exception in terms of what exception might be raised as a result of
    834 
    +  calling this method.
    835 
    +
    836 
    +* For an :ref:`abstract method <contributing_abstract_methods>`, your audience is the
    837 
    +  implementor of the method in a subclass; document the exception in terms of what
    838 
    +  exception is prescribed for the implementing class to raise.
    839 
    +
    840 
    +
    841 
    +.. _contributing_always_consistent:
    842 
    +
    843 
    +Always be consistent
    844 
    +~~~~~~~~~~~~~~~~~~~~
    845 
    +There are various ways to define functions and classes in Python,
    846 
    +which has evolved with various features over time.
    847 
    +
    848 
    +In BuildStream, we may not have leveraged all of the nice features
    849 
    +we could have, that is okay, and where it does not break API, we
    850 
    +can consider changing it.
    851 
    +
    852 
    +Even if you know there is a *better* way to do a given thing in
    853 
    +Python when compared to the way we do it in BuildStream, *do not do it*.
    854 
    +
    855 
    +Consistency of how we do things in the codebase is more important
    856 
    +than the actual way in which things are done, always.
    857 
    +
    858 
    +Instead, if you like a certain Python feature and think the BuildStream
    859 
    +codebase should use it, then propose your change on the `mailing list
    860 
    +<https://mail.gnome.org/mailman/listinfo/buildstream-list>`_. Chances
    861 
    +are that we will reach agreement to use your preferred approach, and
    862 
    +in that case, it will be important to apply the change unilaterally
    863 
    +across the entire codebase, such that we continue to have a consistent
    864 
    +codebase.
    865 
    +
    866 
    +
    867 
    +Avoid tail calling
    868 
    +~~~~~~~~~~~~~~~~~~
    869 
    +With the exception of tail calling with simple functions from
    870 
    +the standard Python library, such as splitting and joining lines
    871 
    +of text and encoding/decoding text; always avoid tail calling.
    872 
    +
    873 
    +**Good**::
    874 
    +
    875 
    +  # Variables that we will need declared up top
    876 
    +  context = self._get_context()
    877 
    +  workspaces = context.get_workspaces()
    878 
    +
    879 
    +  ...
    880 
    +
    881 
    +  # Saving the workspace configuration
    882 
    +  workspaces.save_config()
    883 
    +
    884 
    +**Bad**::
    885 
    +
    886 
    +  # Saving the workspace configuration
    887 
    +  self._get_context().get_workspaces().save_config()
    888 
    +
    889 
    +**Acceptable**::
    890 
    +
    891 
    +  # Decode the raw text loaded from a log file for display,
    892 
    +  # join them into a single utf-8 string and strip away any
    893 
    +  # trailing whitespace.
    894 
    +  return '\n'.join([line.decode('utf-8') for line in lines]).rstrip()
    895 
    +
    896 
    +When you need to obtain a delegate object via an accessor function,
    897 
    +either do it at the beginning of the function, or at the beginning
    898 
    +of a code block within the function that will use that object.
    899 
    +
    900 
    +There are several reasons for this convention:
    901 
    +
    902 
    +* When observing a stack trace, it is always faster and easier to
    903 
    +  determine what went wrong when all statements are on separate lines.
    904 
    +
    905 
    +* We always want individual lines to trace back to their origin as
    906 
    +  much as possible for the purpose of tracing the history of code
    907 
    +  with *git blame*.
    908 
    +
    909 
    +  One day, you might need the ``Context`` or ``Workspaces`` object
    910 
    +  in the same function for another reason, at which point it will
    911 
    +  be unacceptable to leave the existing line as written, because it
    912 
    +  will introduce a redundant accessor to the same object, so the
    913 
    +  line written as::
    914 
    +
    915 
    +    self._get_context().get_workspaces().save_config()
    916 
    +
    917 
    +  Will have to change at that point, meaning we lose the valuable
    918 
    +  information of which commit originally introduced this call
    919 
    +  when running *git blame*.
    920 
    +
    921 
    +* For similar reasons, we prefer delegate objects be accessed near
    922 
    +  the beginning of a function or code block so that there is less
    923 
    +  chance that this statement will have to move in the future, if
    924 
    +  the same function or code block needs the delegate object for any
    925 
    +  other reason.
    926 
    +
    927 
    +  Asides from this, code is generally more legible and uniform when
    928 
    +  variables are declared at the beginning of function blocks.
    929 
    +
    930 
    +
    931 
    +Vertical stacking of modules
    932 
    +~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    933 
    +For the sake of overall comprehensiveness of the BuildStream
    934 
    +architecture, it is important that we retain vertical stacking
    935 
    +order of the dependencies and knowledge of modules as much as
    936 
    +possible, and avoid any cyclic relationships in modules.
    937 
    +
    938 
    +For instance, the ``Source`` objects are owned by ``Element``
    939 
    +objects in the BuildStream data model, and as such the ``Element``
    940 
    +will delegate some activities to the ``Source`` objects in it's
    941 
    +possesion. The ``Source`` objects should however never call functions
    942 
    +on the ``Element`` object, nor should the ``Source`` object itself
    943 
    +have any understanding of what an ``Element`` is.
    944 
    +
    945 
    +If you are implementing a low level utility layer, for example
    946 
    +as a part of the ``YAML`` loading code layers, it can be tempting
    947 
    +to derive context from the higher levels of the codebase which use
    948 
    +these low level utilities, instead of defining properly stand alone
    949 
    +APIs for these utilities to work: Never do this.
    950 
    +
    951 
    +Unfortunately, unlike other languages where include files play
    952 
    +a big part in ensuring that it is difficult to make a mess; Python,
    953 
    +allows you to just call methods on arbitrary objects passed through
    954 
    +a function call without having to import the module which defines
    955 
    +those methods - this leads to cyclic dependencies of modules quickly
    956 
    +if the developer does not take special care of ensuring this does not
    957 
    +happen.
    958 
    +
    959 
    +
    960 
    +Minimize arguments in methods
    961 
    +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    962 
    +When creating an object, or adding a new API method to an existing
    963 
    +object, always strive to keep as much context as possible on the
    964 
    +object itself rather than expecting callers of the methods to provide
    965 
    +everything the method needs every time.
    966 
    +
    967 
    +If the value or object that is needed in a function call is a constant
    968 
    +for the lifetime of the object which exposes the given method, then
    969 
    +that value or object should be passed in the constructor instead of
    970 
    +via a method call.
    971 
    +
    972 
    +
    973 
    +Minimize API surfaces
    974 
    +~~~~~~~~~~~~~~~~~~~~~
    975 
    +When creating an object, or adding new functionality in any way,
    976 
    +try to keep the number of :ref:`public, outward facing <contributing_public_and_private>`
    977 
    +symbols to a minimum, this is important for both
    978 
    +:ref:`internal and public, plugin facing API surfaces <contributing_public_api_surface>`.
    979 
    +
    980 
    +When anyone visits a file, there are two levels of comprehension:
    981 
    +
    982 
    +* What do I need to know in order to *use* this object.
    983 
    +
    984 
    +* What do I need to know in order to *modify* this object.
    985 
    +
    986 
    +For the former, we want the reader to understand with as little effort
    987 
    +as possible, what the public API contract is for a given object and consequently,
    988 
    +how it is expected to be used. This is also why we
    989 
    +:ref:`order the symbols of a class <contributing_class_order>` in such a way
    990 
    +as to keep all outward facing public API surfaces at the top of the file, so that the
    991 
    +reader never needs to dig deep into the bottom of the file to find something they
    992 
    +might need to use.
    993 
    +
    994 
    +For the latter, when it comes to having to modify the file or add functionality,
    995 
    +you want to retain as much freedom as possible to modify internals, while
    996 
    +being sure that nothing external will be affected by internal modifications.
    997 
    +Less client facing API means that you have less surrounding code to modify
    998 
    +when your API changes. Further, ensuring that there is minimal outward facing
    999 
    +API for any module minimizes the complexity for the developer working on
    1000 
    +that module, by limiting the considerations needed regarding external side
    1001 
    +effects of their modifications to the module.
    1002 
    +
    1003 
    +When modifying a file, one should not have to understand or think too
    1004 
    +much about external side effects, when the API surface of the file is
    1005 
    +well documented and minimal.
    1006 
    +
    1007 
    +When adding new API to a given object for a new purpose, consider whether
    1008 
    +the new API is in any way redundant with other API (should this value now
    1009 
    +go into the constructor, since we use it more than once? could this
    1010 
    +value be passed along with another function, and the other function renamed,
    1011 
    +to better suit the new purposes of this module/object?) and repurpose
    1012 
    +the outward facing API of an object as a whole every time.
    1013 
    +
    1014 
    +
    1015 
    +Avoid transient state on instances
    1016 
    +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    1017 
    +At times, it can be tempting to store transient state that is
    1018 
    +the result of one operation on an instance, only to be retrieved
    1019 
    +later via an accessor function elsewhere.
    1020 
    +
    1021 
    +As a basic rule of thumb, if the value is transient and just the
    1022 
    +result of one operation, which needs to be observed directly after
    1023 
    +by another code segment, then never store it on the instance.
    1024 
    +
    1025 
    +BuildStream is complicated in the sense that it is multi processed
    1026 
    +and it is not always obvious how to pass the transient state around
    1027 
    +as a return value or a function parameter. Do not fall prey to this
    1028 
    +obstacle and pollute object instances with transient state.
    1029 
    +
    1030 
    +Instead, always refactor the surrounding code so that the value
    1031 
    +is propagated to the desired end point via a well defined API, either
    1032 
    +by adding new code paths or changing the design such that the
    1033 
    +architecture continues to make sense.
    1034 
    +
    1035 
    +
    1036 
    +Refactor the codebase as needed
    1037 
    +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    1038 
    +Especially when implementing features, always move the BuildStream
    1039 
    +codebase forward as a whole.
    1040 
    +
    1041 
    +Taking a short cut is alright when prototyping, but circumventing
    1042 
    +existing architecture and design to get a feature implemented without
    1043 
    +re-designing the surrounding architecture to accommodate the new
    1044 
    +feature instead, is never acceptable upstream.
    1045 
    +
    1046 
    +For example, let's say that you have to implement a feature and you've
    1047 
    +successfully prototyped it, but it launches a ``Job`` directly from a
    1048 
    +``Queue`` implementation to get the feature to work, while the ``Scheduler``
    1049 
    +is normally responsible for dispatching ``Jobs`` for the elements on
    1050 
    +a ``Queue``. This means that you've proven that your feature can work,
    1051 
    +and now it is time to start working on a patch for upstream.
    1052 
    +
    1053 
    +Consider what the scenario is and why you are circumventing the design,
    1054 
    +and then redesign the ``Scheduler`` and ``Queue`` objects to accommodate for
    1055 
    +the new feature and condition under which you need to dispatch a ``Job``,
    1056 
    +or how you can give the ``Queue`` implementation the additional context it
    1057 
    +needs.
    1058 
    +
    1059 
    +
    1060 
    +Adding core plugins
    1061 
    +-------------------
    1062 
    +This is a checklist of things which need to be done when adding a new
    1063 
    +core plugin to BuildStream proper.
    1064 
    +
    1065 
    +
    1066 
    +Update documentation index
    1067 
    +~~~~~~~~~~~~~~~~~~~~~~~~~~
    1068 
    +The documentation generating scripts will automatically pick up your
    1069 
    +newly added plugin and generate HTML, but will not add a link to the
    1070 
    +documentation of your plugin automatically.
    1071 
    +
    1072 
    +Whenever adding a new plugin, you must add an entry for it in ``doc/source/core_plugins.rst``.
    1073 
    +
    1074 
    +
    1075 
    +Bump format version
    1076 
    +~~~~~~~~~~~~~~~~~~~
    1077 
    +In order for projects to assert that they have a new enough version
    1078 
    +of BuildStream to use the new plugin, the ``BST_FORMAT_VERSION`` must
    1079 
    +be incremented in the ``_versions.py`` file.
    1080 
    +
    1081 
    +Remember to include in your plugin's main documentation, the format
    1082 
    +version in which the plugin was introduced, using the standard annotation
    1083 
    +which we use throughout the documentation, e.g.::
    1084 
    +
    1085 
    +  .. note::
    1086 
    +
    1087 
    +     The ``foo`` plugin is available since :ref:`format version 16 <project_format_version>`
    1088 
    +
    1089 
    +
    1090 
    +Add tests
    1091 
    +~~~~~~~~~
    1092 
    +Needless to say, all new feature additions need to be tested. For ``Element``
    1093 
    +plugins, these usually need to be added to the integration tests. For ``Source``
    1094 
    +plugins, the tests are added in two ways:
    1095 
    +
    1096 
    +* For most normal ``Source`` plugins, it is important to add a new ``Repo``
    1097 
    +  implementation for your plugin in the ``tests/testutils/repo/`` directory
    1098 
    +  and update ``ALL_REPO_KINDS`` in ``tests/testutils/repo/__init__.py``. This
    1099 
    +  will include your new ``Source`` implementation in a series of already existing
    1100 
    +  tests, ensuring it works well under normal operating conditions.
    1101 
    +
    1102 
    +* For other source plugins, or in order to test edge cases, such as failure modes,
    1103 
    +  which are not tested under the normal test battery, add new tests in ``tests/sources``.
    1104 
    +
    1105 
    +
    1106 
    +Extend the cachekey test
    1107 
    +~~~~~~~~~~~~~~~~~~~~~~~~
    1108 
    +For any newly added plugins, it is important to add some new simple elements
    1109 
    +in ``tests/cachekey/project/elements`` or ``tests/cachekey/project/sources``,
    1110 
    +and ensure that the newly added elements are depended on by ``tests/cachekey/project/target.bst``.
    1111 
    +
    1112 
    +One new element should be added to the cache key test for every configuration
    1113 
    +value which your plugin understands which can possibly affect the result of
    1114 
    +your plugin's ``Plugin.get_unique_key()`` implementation.
    1115 
    +
    1116 
    +This test ensures that cache keys do not unexpectedly change or become incompatible
    1117 
    +due to code changes. As such, the cache key test should have full coverage of every
    1118 
    +YAML configuration which can possibly affect cache key outcome at all times.
    1119 
    +
    1120 
    +See the ``tests/cachekey/update.py`` file for instructions on running the updater,
    1121 
    +you need to run the updater to generate the ``.expected`` files and add the new
    1122 
    +``.expected`` files in the same commit which extends the cache key test.
    1123 
    +
    1124 
    +
    1125 
    +Protocol buffers
    1126 
    +----------------
    1127 
    +BuildStream uses protobuf and gRPC for serialization and communication with
    1128 
    +artifact cache servers.  This requires ``.proto`` files and Python code
    1129 
    +generated from the ``.proto`` files using protoc.  All these files live in the
    1130 
    +``buildstream/_protos`` directory.  The generated files are included in the
    1131 
    +git repository to avoid depending on grpcio-tools for user installations.
    1132 
    +
    1133 
    +
    1134 
    +Regenerating code
    1135 
    +~~~~~~~~~~~~~~~~~
    1136 
    +When ``.proto`` files are modified, the corresponding Python code needs to
    1137 
    +be regenerated.  As a prerequisite for code generation you need to install
    1138 
    +``grpcio-tools`` using pip or some other mechanism::
    1139 
    +
    1140 
    +  pip3 install --user grpcio-tools
    1141 
    +
    1142 
    +To actually regenerate the code::
    1143 
    +
    1144 
    +  ./setup.py build_grpc
    1145 
    +
    1146 
    +
    1147 
    +Documenting
    1148 
    +-----------
    222 1149 
     BuildStream starts out as a documented project from day one and uses
    223 1150 
     sphinx to document itself.
    224 1151
    1152 
    +This section discusses formatting policies for editing files in the
    1153 
    +``doc/source`` directory, and describes the details of how the docs are
    1154 
    +generated so that you can easily generate and view the docs yourself before
    1155 
    +submitting patches to the documentation.
    1156 
    +
    1157 
    +For details on how API documenting comments and docstrings are formatted,
    1158 
    +refer to the :ref:`documenting section of the coding guidelines
    1159 
    +<contributing_documenting_symbols>`.
    1160 
    +
    225 1161
    226 1162 
     Documentation formatting policy
    227 1163 
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    228 1164 
     The BuildStream documentation style is as follows:
    229 1165
    230 
    -* Titles and headings require two leading empty lines above them. Only the first word should be capitalized.
    1166 
    +* Titles and headings require two leading empty lines above them.
    1167 
    +  Only the first word in a title should be capitalized.
    231 1168
    232 
    -  * If there is an ``.. _internal_link`` anchor, there should be two empty lines above the anchor, followed by one leading empty line.
    1169 
    +  * If there is an ``.. _internal_link:`` anchor, there should be two empty lines
    1170 
    +    above the anchor, followed by one leading empty line.
    233 1171
    234 1172 
     * Within a section, paragraphs should be separated by one empty line.
    235 1173
    236 
    -* Notes are defined using: ``.. note::`` blocks, followed by an empty line and then indented (3 spaces) text.
    1174 
    +* Notes are defined using: ``.. note::`` blocks, followed by an empty line
    1175 
    +  and then indented (3 spaces) text.
    237 1176
    238 
    -* Code blocks are defined using: ``.. code:: LANGUAGE`` blocks, followed by an empty line and then indented (3 spaces) text. Note that the default language is `python`.
    1177 
    +  * Other kinds of notes can be used throughout the documentation and will
    1178 
    +    be decorated in different ways, these work in the same way as ``.. note::`` does.
    1179 
    +
    1180 
    +    Feel free to also use ``.. attention::`` or ``.. important::`` to call special
    1181 
    +    attention to a paragraph, ``.. tip::`` to give the reader a special tip on how
    1182 
    +    to use an advanced feature or ``.. warning::`` to warn the user about a potential
    1183 
    +    misuse of the API and explain it's consequences.
    1184 
    +
    1185 
    +* Code blocks are defined using: ``.. code:: LANGUAGE`` blocks, followed by an empty
    1186 
    +  line and then indented (3 spaces) text. Note that the default language is ``python``.
    239 1187
    240 1188 
     * Cross references should be of the form ``:role:`target```.
    241 1189
    242 
    -  * To cross reference arbitrary locations with, for example, the anchor ``_anchor_name``, you must give the link an explicit title: ``:ref:`Link text <anchor_name>```. Note that the "_" prefix is not required.
    1190 
    +  * Explicit anchors can be declared as ``.. _anchor_name:`` on a line by itself.
    1191 
    +
    1192 
    +  * To cross reference arbitrary locations with, for example, the anchor ``anchor_name``,
    1193 
    +    always provide some explicit text in the link instead of deriving the text from
    1194 
    +    the target, e.g.: ``:ref:`Link text <anchor_name>```.
    1195 
    +    Note that the "_" prefix is not used when referring to the target.
    243 1196
    244 1197 
     Useful links:
    245 1198
    246 
    -For further information, please see the `Sphinx Documentation <http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html>`_.
    1199 
    +For further information, please see the `Sphinx Documentation
    1200 
    +<http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html>`_.
    247 1201
    248 1202
    249 1203 
     Building Docs
    ... ... @@ -312,54 +1266,28 @@ the ``man/`` subdirectory, which will be automatically included
    312 1266 
     in the buildstream distribution.
    313 1267
    314 1268
    315 
    -Documenting conventions
    316 
    -~~~~~~~~~~~~~~~~~~~~~~~
    317 
    -We use the sphinx.ext.napoleon extension for the purpose of having
    318 
    -a bit nicer docstrings than the default sphinx docstrings.
    319 
    -
    320 
    -A docstring for a method, class or function should have the following
    321 
    -format::
    322 
    -
    323 
    -  """Brief description of entity
    324 
    -
    325 
    -  Args:
    326 
    -     argument1 (type): Description of arg
    327 
    -     argument2 (type): Description of arg
    328 
    -
    329 
    -  Returns:
    330 
    -     (type): Description of returned thing of the specified type
    331 
    -
    332 
    -  Raises:
    333 
    -     (SomeError): When some error occurs
    334 
    -     (SomeOtherError): When some other error occurs
    335 
    -
    336 
    -  A detailed description can go here if one is needed, only
    337 
    -  after the above part documents the calling conventions.
    338 
    -  """
    339 
    -
    340 
    -
    341 1269 
     Documentation Examples
    342 1270 
     ~~~~~~~~~~~~~~~~~~~~~~
    343 1271 
     The examples section of the documentation contains a series of standalone
    344 1272 
     examples, here are the criteria for an example addition.
    345 1273
    346 
    -* The example has a ``${name}``
    1274 
    +* The example has a ``${name}``.
    347 1275
    348 
    -* The example has a project users can copy and use
    1276 
    +* The example has a project users can copy and use.
    349 1277
    350 
    -  * This project is added in the directory ``doc/examples/${name}``
    1278 
    +  * This project is added in the directory ``doc/examples/${name}``.
    351 1279
    352 
    -* The example has a documentation component
    1280 
    +* The example has a documentation component.
    353 1281
    354 1282 
       * This is added at ``doc/source/examples/${name}.rst``
    355 1283 
       * A reference to ``examples/${name}`` is added to the toctree in ``doc/source/examples.rst``
    356 1284 
       * This documentation discusses the project elements declared in the project and may
    357 
    -    provide some BuildStream command examples
    358 
    -  * This documentation links out to the reference manual at every opportunity
    1285 
    +    provide some BuildStream command examples.
    1286 
    +  * This documentation links out to the reference manual at every opportunity.
    359 1287
    360 
    -* The example has a CI test component
    1288 
    +* The example has a CI test component.
    361 1289
    362 
    -  * This is an integration test added at ``tests/examples/${name}``
    1290 
    +  * This is an integration test added at ``tests/examples/${name}``.
    363 1291 
       * This test runs BuildStream in the ways described in the example
    364 1292 
         and assert that we get the results which we advertize to users in
    365 1293 
         the said examples.
    ... ... @@ -386,17 +1314,17 @@ The ``.run`` file format is just another YAML dictionary which consists of a
    386 1314
    387 1315 
     Each *command* is a dictionary, the members of which are listed here:
    388 1316
    389 
    -* ``directory``: The input file relative project directory
    1317 
    +* ``directory``: The input file relative project directory.
    390 1318
    391 
    -* ``output``: The input file relative output html file to generate (optional)
    1319 
    +* ``output``: The input file relative output html file to generate (optional).
    392 1320
    393 1321 
     * ``fake-output``: Don't really run the command, just pretend to and pretend
    394 1322 
       this was the output, an empty string will enable this too.
    395 1323
    396 
    -* ``command``: The command to run, without the leading ``bst``
    1324 
    +* ``command``: The command to run, without the leading ``bst``.
    397 1325
    398 1326 
     * ``shell``: Specifying ``True`` indicates that ``command`` should be run as
    399 
    -  a shell command from the project directory, instead of a bst command (optional)
    1327 
    +  a shell command from the project directory, instead of a bst command (optional).
    400 1328
    401 1329 
     When adding a new ``.run`` file, one should normally also commit the new
    402 1330 
     resulting generated ``.html`` file(s) into the ``doc/source/sessions-stored/``
    ... ... @@ -419,30 +1347,10 @@ regenerate them locally in order to build the docs.
    419 1347 
          command: build hello.bst
    420 1348
    421 1349
    422 
    -Protocol Buffers
    423 
    -----------------
    424 
    -BuildStream uses protobuf and gRPC for serialization and communication with
    425 
    -artifact cache servers.  This requires ``.proto`` files and Python code
    426 
    -generated from the ``.proto`` files using protoc.  All these files live in the
    427 
    -``buildstream/_protos`` directory.  The generated files are included in the
    428 
    -git repository to avoid depending on grpcio-tools for user installations.
    1350 
    +.. _contributing_testing:
    429 1351
    430 
    -
    431 
    -Regenerating code
    432 
    -~~~~~~~~~~~~~~~~~
    433 
    -When ``.proto`` files are modified, the corresponding Python code needs to
    434 
    -be regenerated.  As a prerequisite for code generation you need to install
    435 
    -``grpcio-tools`` using pip or some other mechanism::
    436 
    -
    437 
    -  pip3 install --user grpcio-tools
    438 
    -
    439 
    -To actually regenerate the code::
    440 
    -
    441 
    -  ./setup.py build_grpc
    442 
    -
    443 
    -
    444 
    -Testing BuildStream
    445 
    --------------------
    1352 
    +Testing
    1353 
    +-------
    446 1354 
     BuildStream uses pytest for regression tests and testing out
    447 1355 
     the behavior of newly added components.
    448 1356
    ... ... @@ -495,6 +1403,7 @@ with::
    495 1403 
     Alternatively, any IDE plugin that uses pytest should automatically
    496 1404 
     detect the ``.pylintrc`` in the project's root directory.
    497 1405
    1406 
    +
    498 1407 
     Adding tests
    499 1408 
     ~~~~~~~~~~~~
    500 1409 
     Tests are found in the tests subdirectory, inside of which
    ... ... @@ -513,7 +1422,7 @@ a subdirectory beside your test in which to store data.
    513 1422 
     When creating a test that needs data, use the datafiles extension
    514 1423 
     to decorate your test case (again, examples exist in the existing
    515 1424 
     tests for this), documentation on the datafiles extension can
    516 
    -be found here: https://pypi.python.org/pypi/pytest-datafiles
    1425 
    +be found here: https://pypi.python.org/pypi/pytest-datafiles.
    517 1426
    518 1427 
     Tests that run a sandbox should be decorated with::
    519 1428
    ... ... @@ -521,8 +1430,9 @@ Tests that run a sandbox should be decorated with::
    521 1430
    522 1431 
     and use the integration cli helper.
    523 1432
    524 
    -Measuring BuildStream performance
    525 
    ----------------------------------
    1433 
    +
    1434 
    +Measuring performance
    1435 
    +---------------------
    526 1436
    527 1437
    528 1438 
     Benchmarking framework

  • NEWS
    ... ... @@ -24,6 +24,9 @@ buildstream 1.3.1
    24 24 
       o Add new `pip` source plugin for downloading python packages using pip,
    25 25 
         based on requirements files from previous sources.
    26 26
    27 
    +  o Generate Docker images from built artifacts using
    28 
    +    `contrib/bst-docker-import` script.
    29 
    +
    27 30
    28 31 
     =================
    29 32 
     buildstream 1.1.5

  • README.rst
    ... ... @@ -19,7 +19,8 @@ About
    19 19
    20 20 
     What is BuildStream?
    21 21 
     ====================
    22 
    -BuildStream is a Free Software tool for building/integrating software stacks.
    22 
    +`BuildStream <https://buildstream.build>`_ is a Free Software tool for
    23 
    +building/integrating software stacks.
    23 24 
     It takes inspiration, lessons and use-cases from various projects including
    24 25 
     OBS, Reproducible Builds, Yocto, Baserock, Buildroot, Aboriginal, GNOME Continuous,
    25 26 
     JHBuild, Flatpak Builder and Android repo.

  • buildstream/_artifactcache/cascache.py
    ... ... @@ -506,7 +506,7 @@ class CASCache(ArtifactCache):
    506 506 
         def set_ref(self, ref, tree):
    507 507 
             refpath = self._refpath(ref)
    508 508 
             os.makedirs(os.path.dirname(refpath), exist_ok=True)
    509 
    -        with utils.save_file_atomic(refpath, 'wb') as f:
    509 
    +        with utils.save_file_atomic(refpath, 'wb', tempdir=self.tmpdir) as f:
    510 510 
                 f.write(tree.SerializeToString())
    511 511
    512 512 
         # resolve_ref():
    ... ... @@ -1048,10 +1048,29 @@ class CASCache(ArtifactCache):
    1048 1048 
                     missing_blobs[d.hash] = d
    1049 1049
    1050 1050 
             # Upload any blobs missing on the server
    1051 
    -        for blob_digest in missing_blobs.values():
    1052 
    -            with open(self.objpath(blob_digest), 'rb') as f:
    1053 
    -                assert os.fstat(f.fileno()).st_size == blob_digest.size_bytes
    1054 
    -                self._send_blob(remote, blob_digest, f, u_uid=u_uid)
    1051 
    +        self._send_blobs(remote, missing_blobs.values(), u_uid)
    1052 
    +
    1053 
    +    def _send_blobs(self, remote, digests, u_uid=uuid.uuid4()):
    1054 
    +        batch = _CASBatchUpdate(remote)
    1055 
    +
    1056 
    +        for digest in digests:
    1057 
    +            with open(self.objpath(digest), 'rb') as f:
    1058 
    +                assert os.fstat(f.fileno()).st_size == digest.size_bytes
    1059 
    +
    1060 
    +                if (digest.size_bytes >= remote.max_batch_total_size_bytes or
    1061 
    +                        not remote.batch_update_supported):
    1062 
    +                    # Too large for batch request, upload in independent request.
    1063 
    +                    self._send_blob(remote, digest, f, u_uid=u_uid)
    1064 
    +                else:
    1065 
    +                    if not batch.add(digest, f):
    1066 
    +                        # Not enough space left in batch request.
    1067 
    +                        # Complete pending batch first.
    1068 
    +                        batch.send()
    1069 
    +                        batch = _CASBatchUpdate(remote)
    1070 
    +                        batch.add(digest, f)
    1071 
    +
    1072 
    +        # Send final batch
    1073 
    +        batch.send()
    1055 1074
    1056 1075
    1057 1076 
     # Represents a single remote CAS cache.
    ... ... @@ -1126,6 +1145,17 @@ class _CASRemote():
    1126 1145 
                     if e.code() != grpc.StatusCode.UNIMPLEMENTED:
    1127 1146 
                         raise
    1128 1147
    1148 
    +            # Check whether the server supports BatchUpdateBlobs()
    1149 
    +            self.batch_update_supported = False
    1150 
    +            try:
    1151 
    +                request = remote_execution_pb2.BatchUpdateBlobsRequest()
    1152 
    +                response = self.cas.BatchUpdateBlobs(request)
    1153 
    +                self.batch_update_supported = True
    1154 
    +            except grpc.RpcError as e:
    1155 
    +                if (e.code() != grpc.StatusCode.UNIMPLEMENTED and
    1156 
    +                        e.code() != grpc.StatusCode.PERMISSION_DENIED):
    1157 
    +                    raise
    1158 
    +
    1129 1159 
                 self._initialized = True
    1130 1160
    1131 1161
    ... ... @@ -1173,6 +1203,46 @@ class _CASBatchRead():
    1173 1203 
                 yield (response.digest, response.data)
    1174 1204
    1175 1205
    1206 
    +# Represents a batch of blobs queued for upload.
    1207 
    +#
    1208 
    +class _CASBatchUpdate():
    1209 
    +    def __init__(self, remote):
    1210 
    +        self._remote = remote
    1211 
    +        self._max_total_size_bytes = remote.max_batch_total_size_bytes
    1212 
    +        self._request = remote_execution_pb2.BatchUpdateBlobsRequest()
    1213 
    +        self._size = 0
    1214 
    +        self._sent = False
    1215 
    +
    1216 
    +    def add(self, digest, stream):
    1217 
    +        assert not self._sent
    1218 
    +
    1219 
    +        new_batch_size = self._size + digest.size_bytes
    1220 
    +        if new_batch_size > self._max_total_size_bytes:
    1221 
    +            # Not enough space left in current batch
    1222 
    +            return False
    1223 
    +
    1224 
    +        blob_request = self._request.requests.add()
    1225 
    +        blob_request.digest.hash = digest.hash
    1226 
    +        blob_request.digest.size_bytes = digest.size_bytes
    1227 
    +        blob_request.data = stream.read(digest.size_bytes)
    1228 
    +        self._size = new_batch_size
    1229 
    +        return True
    1230 
    +
    1231 
    +    def send(self):
    1232 
    +        assert not self._sent
    1233 
    +        self._sent = True
    1234 
    +
    1235 
    +        if len(self._request.requests) == 0:
    1236 
    +            return
    1237 
    +
    1238 
    +        batch_response = self._remote.cas.BatchUpdateBlobs(self._request)
    1239 
    +
    1240 
    +        for response in batch_response.responses:
    1241 
    +            if response.status.code != grpc.StatusCode.OK.value[0]:
    1242 
    +                raise ArtifactError("Failed to upload blob {}: {}".format(
    1243 
    +                    response.digest.hash, response.status.code))
    1244 
    +
    1245 
    +
    1176 1246 
     def _grouper(iterable, n):
    1177 1247 
         while True:
    1178 1248 
             try:

  • buildstream/_artifactcache/casserver.py
    ... ... @@ -68,7 +68,7 @@ def create_server(repo, *, enable_push):
    68 68 
             _ByteStreamServicer(artifactcache, enable_push=enable_push), server)
    69 69
    70 70 
         remote_execution_pb2_grpc.add_ContentAddressableStorageServicer_to_server(
    71 
    -        _ContentAddressableStorageServicer(artifactcache), server)
    71 
    +        _ContentAddressableStorageServicer(artifactcache, enable_push=enable_push), server)
    72 72
    73 73 
         remote_execution_pb2_grpc.add_CapabilitiesServicer_to_server(
    74 74 
             _CapabilitiesServicer(), server)
    ... ... @@ -222,9 +222,10 @@ class _ByteStreamServicer(bytestream_pb2_grpc.ByteStreamServicer):
    222 222
    223 223
    224 224 
     class _ContentAddressableStorageServicer(remote_execution_pb2_grpc.ContentAddressableStorageServicer):
    225 
    -    def __init__(self, cas):
    225 
    +    def __init__(self, cas, *, enable_push):
    226 226 
             super().__init__()
    227 227 
             self.cas = cas
    228 
    +        self.enable_push = enable_push
    228 229
    229 230 
         def FindMissingBlobs(self, request, context):
    230 231 
             response = remote_execution_pb2.FindMissingBlobsResponse()
    ... ... @@ -260,6 +261,46 @@ class _ContentAddressableStorageServicer(remote_execution_pb2_grpc.ContentAddres
    260 261
    261 262 
             return response
    262 263
    264 
    +    def BatchUpdateBlobs(self, request, context):
    265 
    +        response = remote_execution_pb2.BatchUpdateBlobsResponse()
    266 
    +
    267 
    +        if not self.enable_push:
    268 
    +            context.set_code(grpc.StatusCode.PERMISSION_DENIED)
    269 
    +            return response
    270 
    +
    271 
    +        batch_size = 0
    272 
    +
    273 
    +        for blob_request in request.requests:
    274 
    +            digest = blob_request.digest
    275 
    +
    276 
    +            batch_size += digest.size_bytes
    277 
    +            if batch_size > _MAX_PAYLOAD_BYTES:
    278 
    +                context.set_code(grpc.StatusCode.INVALID_ARGUMENT)
    279 
    +                return response
    280 
    +
    281 
    +            blob_response = response.responses.add()
    282 
    +            blob_response.digest.hash = digest.hash
    283 
    +            blob_response.digest.size_bytes = digest.size_bytes
    284 
    +
    285 
    +            if len(blob_request.data) != digest.size_bytes:
    286 
    +                blob_response.status.code = grpc.StatusCode.FAILED_PRECONDITION
    287 
    +                continue
    288 
    +
    289 
    +            try:
    290 
    +                _clean_up_cache(self.cas, digest.size_bytes)
    291 
    +
    292 
    +                with tempfile.NamedTemporaryFile(dir=self.cas.tmpdir) as out:
    293 
    +                    out.write(blob_request.data)
    294 
    +                    out.flush()
    295 
    +                    server_digest = self.cas.add_object(path=out.name)
    296 
    +                    if server_digest.hash != digest.hash:
    297 
    +                        blob_response.status.code = grpc.StatusCode.FAILED_PRECONDITION
    298 
    +
    299 
    +            except ArtifactTooLargeException:
    300 
    +                blob_response.status.code = grpc.StatusCode.RESOURCE_EXHAUSTED
    301 
    +
    302 
    +        return response
    303 
    +
    263 304
    264 305 
     class _CapabilitiesServicer(remote_execution_pb2_grpc.CapabilitiesServicer):
    265 306 
         def GetCapabilities(self, request, context):

  • buildstream/_context.py
    ... ... @@ -110,6 +110,9 @@ class Context():
    110 110 
             # Make sure the XDG vars are set in the environment before loading anything
    111 111 
             self._init_xdg()
    112 112
    113 
    +        # Whether to not include artifact buildtrees in workspaces if available
    114 
    +        self.workspacebuildtrees = True
    115 
    +
    113 116 
             # Private variables
    114 117 
             self._cache_key = None
    115 118 
             self._message_handler = None
    ... ... @@ -160,7 +163,7 @@ class Context():
    160 163 
             _yaml.node_validate(defaults, [
    161 164 
                 'sourcedir', 'builddir', 'artifactdir', 'logdir',
    162 165 
                 'scheduler', 'artifacts', 'logging', 'projects',
    163 
    -            'cache'
    166 
    +            'cache', 'workspacebuildtrees'
    164 167 
             ])
    165 168
    166 169 
             for directory in ['sourcedir', 'builddir', 'artifactdir', 'logdir']:
    ... ... @@ -185,6 +188,9 @@ class Context():
    185 188 
             # Load artifact share configuration
    186 189 
             self.artifact_cache_specs = ArtifactCache.specs_from_config_node(defaults)
    187 190
    191 
    +        # Load workspace buildtrees configuration
    192 
    +        self.workspacebuildtrees = _yaml.node_get(defaults, bool, 'workspacebuildtrees', default_value='True')
    193 
    +
    188 194 
             # Load logging config
    189 195 
             logging = _yaml.node_get(defaults, Mapping, 'logging')
    190 196 
             _yaml.node_validate(logging, [

  • buildstream/_frontend/cli.py
    ... ... @@ -681,12 +681,16 @@ def workspace():
    681 681 
                   help="Overwrite files existing in checkout directory")
    682 682 
     @click.option('--track', 'track_', default=False, is_flag=True,
    683 683 
                   help="Track and fetch new source references before checking out the workspace")
    684 
    +@click.option('--no-cache', default=False, is_flag=True,
    685 
    +              help="Do not checkout the cached buildtree")
    684 686 
     @click.argument('element',
    685 687 
                     type=click.Path(readable=False))
    686 688 
     @click.argument('directory', type=click.Path(file_okay=False))
    687 689 
     @click.pass_obj
    688 
    -def workspace_open(app, no_checkout, force, track_, element, directory):
    689 
    -    """Open a workspace for manual source modification"""
    690 
    +def workspace_open(app, no_checkout, force, track_, no_cache, element, directory):
    691 
    +    """Open a workspace for manual source modification, the elements buildtree
    692 
    +    will be provided if available in the local artifact cache.
    693 
    +    """
    690 694
    691 695 
         if os.path.exists(directory):
    692 696
    ... ... @@ -698,11 +702,15 @@ def workspace_open(app, no_checkout, force, track_, element, directory):
    698 702 
                 click.echo("Checkout directory is not empty: {}".format(directory), err=True)
    699 703 
                 sys.exit(-1)
    700 704
    705 
    +    if not no_cache:
    706 
    +        click.echo("WARNING: Workspace will be opened without the cached buildtree if not cached locally")
    707 
    +
    701 708 
         with app.initialized():
    702 709 
             app.stream.workspace_open(element, directory,
    703 710 
                                       no_checkout=no_checkout,
    704 711 
                                       track_first=track_,
    705 
    -                                  force=force)
    712 
    +                                  force=force,
    713 
    +                                  no_cache=no_cache)
    706 714
    707 715
    708 716 
     ##################################################################

  • buildstream/_platform/darwin.py
    ... ... @@ -34,6 +34,9 @@ class Darwin(Platform):
    34 34 
             super().__init__()
    35 35
    36 36 
         def create_sandbox(self, *args, **kwargs):
    37 
    +        kwargs['dummy_reason'] = \
    38 
    +            "OSXFUSE is not supported and there are no supported sandbox" + \
    39 
    +            "technologies for OSX at this time"
    37 40 
             return SandboxDummy(*args, **kwargs)
    38 41
    39 42 
         def check_sandbox_config(self, config):
    ... ... @@ -41,10 +44,11 @@ class Darwin(Platform):
    41 44 
             return True
    42 45
    43 46 
         def get_cpu_count(self, cap=None):
    44 
    -        if cap < os.cpu_count():
    45 
    -            return cap
    47 
    +        cpu_count = os.cpu_count()
    48 
    +        if cap is None:
    49 
    +            return cpu_count
    46 50 
             else:
    47 
    -            return os.cpu_count()
    51 
    +            return min(cpu_count, cap)
    48 52
    49 53 
         def set_resource_limits(self, soft_limit=OPEN_MAX, hard_limit=None):
    50 54 
             super().set_resource_limits(soft_limit)

  • buildstream/_platform/linux.py
    ... ... @@ -37,24 +37,30 @@ class Linux(Platform):
    37 37 
             self._uid = os.geteuid()
    38 38 
             self._gid = os.getegid()
    39 39
    40 
    +        self._have_fuse = os.path.exists("/dev/fuse")
    41 
    +        self._bwrap_exists = _site.check_bwrap_version(0, 0, 0)
    42 
    +        self._have_good_bwrap = _site.check_bwrap_version(0, 1, 2)
    43 
    +
    44 
    +        self._local_sandbox_available = self._have_fuse and self._have_good_bwrap
    45 
    +
    40 46 
             self._die_with_parent_available = _site.check_bwrap_version(0, 1, 8)
    41 47
    42 
    -        if self._local_sandbox_available():
    48 
    +        if self._local_sandbox_available:
    43 49 
                 self._user_ns_available = self._check_user_ns_available()
    44 50 
             else:
    45 51 
                 self._user_ns_available = False
    46 52
    47 53 
         def create_sandbox(self, *args, **kwargs):
    48 
    -        if not self._local_sandbox_available():
    49 
    -            return SandboxDummy(*args, **kwargs)
    54 
    +        if not self._local_sandbox_available:
    55 
    +            return self._create_dummy_sandbox(*args, **kwargs)
    50 56 
             else:
    51 
    -            from ..sandbox._sandboxbwrap import SandboxBwrap
    52 
    -            # Inform the bubblewrap sandbox as to whether it can use user namespaces or not
    53 
    -            kwargs['user_ns_available'] = self._user_ns_available
    54 
    -            kwargs['die_with_parent_available'] = self._die_with_parent_available
    55 
    -            return SandboxBwrap(*args, **kwargs)
    57 
    +            return self._create_bwrap_sandbox(*args, **kwargs)
    56 58
    57 59 
         def check_sandbox_config(self, config):
    60 
    +        if not self._local_sandbox_available:
    61 
    +            # Accept all sandbox configs as it's irrelevant with the dummy sandbox (no Sandbox.run).
    62 
    +            return True
    63 
    +
    58 64 
             if self._user_ns_available:
    59 65 
                 # User namespace support allows arbitrary build UID/GID settings.
    60 66 
                 return True
    ... ... @@ -66,11 +72,26 @@ class Linux(Platform):
    66 72 
         ################################################
    67 73 
         #              Private Methods                 #
    68 74 
         ################################################
    69 
    -    def _local_sandbox_available(self):
    70 
    -        try:
    71 
    -            return os.path.exists(utils.get_host_tool('bwrap')) and os.path.exists('/dev/fuse')
    72 
    -        except utils.ProgramNotFoundError:
    73 
    -            return False
    75 
    +
    76 
    +    def _create_dummy_sandbox(self, *args, **kwargs):
    77 
    +        reasons = []
    78 
    +        if not self._have_fuse:
    79 
    +            reasons.append("FUSE is unavailable")
    80 
    +        if not self._have_good_bwrap:
    81 
    +            if self._bwrap_exists:
    82 
    +                reasons.append("`bwrap` is too old (bst needs at least 0.1.2)")
    83 
    +            else:
    84 
    +                reasons.append("`bwrap` executable not found")
    85 
    +
    86 
    +        kwargs['dummy_reason'] = " and ".join(reasons)
    87 
    +        return SandboxDummy(*args, **kwargs)
    88 
    +
    89 
    +    def _create_bwrap_sandbox(self, *args, **kwargs):
    90 
    +        from ..sandbox._sandboxbwrap import SandboxBwrap
    91 
    +        # Inform the bubblewrap sandbox as to whether it can use user namespaces or not
    92 
    +        kwargs['user_ns_available'] = self._user_ns_available
    93 
    +        kwargs['die_with_parent_available'] = self._die_with_parent_available
    94 
    +        return SandboxBwrap(*args, **kwargs)
    74 95
    75 96 
         def _check_user_ns_available(self):
    76 97 
             # Here, lets check if bwrap is able to create user namespaces,

  • buildstream/_platform/platform.py
    ... ... @@ -67,7 +67,11 @@ class Platform():
    67 67 
             return cls._instance
    68 68
    69 69 
         def get_cpu_count(self, cap=None):
    70 
    -        return min(len(os.sched_getaffinity(0)), cap)
    70 
    +        cpu_count = len(os.sched_getaffinity(0))
    71 
    +        if cap is None:
    72 
    +            return cpu_count
    73 
    +        else:
    74 
    +            return min(cpu_count, cap)
    71 75
    72 76 
         ##################################################################
    73 77 
         #                        Sandbox functions                       #

  • buildstream/_scheduler/jobs/job.py
    ... ... @@ -119,6 +119,8 @@ class Job():
    119 119 
             self._result = None                    # Return value of child action in the parent
    120 120 
             self._tries = 0                        # Try count, for retryable jobs
    121 121 
             self._skipped_flag = False             # Indicate whether the job was skipped.
    122 
    +        self._terminated = False               # Whether this job has been explicitly terminated
    123 
    +
    122 124 
             # If False, a retry will not be attempted regardless of whether _tries is less than _max_retries.
    123 125 
             #
    124 126 
             self._retry_flag = True
    ... ... @@ -190,6 +192,8 @@ class Job():
    190 192 
             # Terminate the process using multiprocessing API pathway
    191 193 
             self._process.terminate()
    192 194
    195 
    +        self._terminated = True
    196 
    +
    193 197 
         # terminate_wait()
    194 198 
         #
    195 199 
         # Wait for terminated jobs to complete
    ... ... @@ -273,18 +277,22 @@ class Job():
    273 277 
         # running the integration commands).
    274 278 
         #
    275 279 
         # Args:
    276 
    -    #     (int): The plugin identifier for this task
    280 
    +    #     task_id (int): The plugin identifier for this task
    277 281 
         #
    278 282 
         def set_task_id(self, task_id):
    279 283 
             self._task_id = task_id
    280 284
    281 285 
         # skipped
    282 286 
         #
    287 
    +    # This will evaluate to True if the job was skipped
    288 
    +    # during processing, or if it was forcefully terminated.
    289 
    +    #
    283 290 
         # Returns:
    284 
    -    #    bool: True if the job was skipped while processing.
    291 
    +    #    (bool): Whether the job should appear as skipped
    292 
    +    #
    285 293 
         @property
    286 294 
         def skipped(self):
    287 
    -        return self._skipped_flag
    295 
    +        return self._skipped_flag or self._terminated
    288 296
    289 297 
         #######################################################
    290 298 
         #                  Abstract Methods                   #

  • buildstream/_scheduler/queues/queue.py
    ... ... @@ -326,16 +326,20 @@ class Queue():
    326 326 
                               detail=traceback.format_exc())
    327 327 
                 self.failed_elements.append(element)
    328 328 
             else:
    329 
    -
    330 
    -            # No exception occured, handle the success/failure state in the normal way
    331 329 
                 #
    330 
    +            # No exception occured in post processing
    331 
    +            #
    332 
    +
    333 
    +            # All jobs get placed on the done queue for later processing.
    332 334 
                 self._done_queue.append(job)
    333 335
    334 
    -            if success:
    335 
    -                if not job.skipped:
    336 
    -                    self.processed_elements.append(element)
    337 
    -                else:
    338 
    -                    self.skipped_elements.append(element)
    336 
    +            # A Job can be skipped whether or not it has failed,
    337 
    +            # we want to only bookkeep them as processed or failed
    338 
    +            # if they are not skipped.
    339 
    +            if job.skipped:
    340 
    +                self.skipped_elements.append(element)
    341 
    +            elif success:
    342 
    +                self.processed_elements.append(element)
    339 343 
                 else:
    340 344 
                     self.failed_elements.append(element)
    341 345

  • buildstream/_scheduler/scheduler.py
    ... ... @@ -387,6 +387,15 @@ class Scheduler():
    387 387 
         # A loop registered event callback for keyboard interrupts
    388 388 
         #
    389 389 
         def _interrupt_event(self):
    390 
    +
    391 
    +        # FIXME: This should not be needed, but for some reason we receive an
    392 
    +        #        additional SIGINT event when the user hits ^C a second time
    393 
    +        #        to inform us that they really intend to terminate; even though
    394 
    +        #        we have disconnected our handlers at this time.
    395 
    +        #
    396 
    +        if self.terminated:
    397 
    +            return
    398 
    +
    390 399 
             # Leave this to the frontend to decide, if no
    391 400 
             # interrrupt callback was specified, then just terminate.
    392 401 
             if self._interrupt_callback:

  • buildstream/_site.py
    ... ... @@ -78,18 +78,12 @@ def check_bwrap_version(major, minor, patch):
    78 78 
             if not bwrap_path:
    79 79 
                 return False
    80 80 
             cmd = [bwrap_path, "--version"]
    81 
    -        version = str(subprocess.check_output(cmd).split()[1], "utf-8")
    81 
    +        try:
    82 
    +            version = str(subprocess.check_output(cmd).split()[1], "utf-8")
    83 
    +        except subprocess.CalledProcessError:
    84 
    +            # Failure trying to run bubblewrap
    85 
    +            return False
    82 86 
             _bwrap_major, _bwrap_minor, _bwrap_patch = map(int, version.split("."))
    83 87
    84 88 
         # Check whether the installed version meets the requirements
    85 
    -    if _bwrap_major > major:
    86 
    -        return True
    87 
    -    elif _bwrap_major < major:
    88 
    -        return False
    89 
    -    else:
    90 
    -        if _bwrap_minor > minor:
    91 
    -            return True
    92 
    -        elif _bwrap_minor < minor:
    93 
    -            return False
    94 
    -        else:
    95 
    -            return _bwrap_patch >= patch
    89 
    +    return (_bwrap_major, _bwrap_minor, _bwrap_patch) >= (major, minor, patch)

  • buildstream/_stream.py
    ... ... @@ -446,11 +446,13 @@ class Stream():
    446 446 
         #    no_checkout (bool): Whether to skip checking out the source
    447 447 
         #    track_first (bool): Whether to track and fetch first
    448 448 
         #    force (bool): Whether to ignore contents in an existing directory
    449 
    +    #    no_cache (bool): Whether to not include the cached buildtree
    449 450 
         #
    450 451 
         def workspace_open(self, target, directory, *,
    451 452 
                            no_checkout,
    452 453 
                            track_first,
    453 
    -                       force):
    454 
    +                       force,
    455 
    +                       no_cache):
    454 456
    455 457 
             if track_first:
    456 458 
                 track_targets = (target,)

  • buildstream/element.py
    ... ... @@ -212,7 +212,7 @@ class Element(Plugin):
    212 212 
             self.__staged_sources_directory = None  # Location where Element.stage_sources() was called
    213 213 
             self.__tainted = None                   # Whether the artifact is tainted and should not be shared
    214 214 
             self.__required = False                 # Whether the artifact is required in the current session
    215 
    -        self.__build_result = None              # The result of assembling this Element
    215 
    +        self.__build_result = None              # The result of assembling this Element (success, description, detail)
    216 216 
             self._build_log_path = None            # The path of the build log for this Element
    217 217
    218 218 
             # hash tables of loaded artifact metadata, hashed by key
    ... ... @@ -1316,7 +1316,8 @@ class Element(Plugin):
    1316 1316 
         #
    1317 1317 
         @contextmanager
    1318 1318 
         def _prepare_sandbox(self, scope, directory, deps='run', integrate=True):
    1319 
    -        with self.__sandbox(directory, config=self.__sandbox_config) as sandbox:
    1319 
    +        # bst shell and bst checkout require a local sandbox.
    1320 
    +        with self.__sandbox(directory, config=self.__sandbox_config, allow_remote=False) as sandbox:
    1320 1321
    1321 1322 
                 # Configure always comes first, and we need it.
    1322 1323 
                 self.configure_sandbox(sandbox)
    ... ... @@ -1379,10 +1380,10 @@ class Element(Plugin):
    1379 1380 
                 if not vdirectory.is_empty():
    1380 1381 
                     raise ElementError("Staging directory '{}' is not empty".format(vdirectory))
    1381 1382
    1382 
    -            # While mkdtemp is advertised as using the TMP environment variable, it
    1383 
    -            # doesn't, so this explicit extraction is necesasry.
    1384 
    -            tmp_prefix = os.environ.get("TMP", None)
    1385 
    -            temp_staging_directory = tempfile.mkdtemp(prefix=tmp_prefix)
    1383 
    +            # It's advantageous to have this temporary directory on
    1384 
    +            # the same filing system as the rest of our cache.
    1385 
    +            temp_staging_location = os.path.join(self._get_context().artifactdir, "staging_temp")
    1386 
    +            temp_staging_directory = tempfile.mkdtemp(prefix=temp_staging_location)
    1386 1387
    1387 1388 
                 try:
    1388 1389 
                     workspace = self._get_workspace()
    ... ... @@ -1479,11 +1480,13 @@ class Element(Plugin):
    1479 1480
    1480 1481 
             self._update_state()
    1481 1482
    1482 
    -        if self._get_workspace() and self._cached():
    1483 
    +        if self._get_workspace() and self._cached_success():
    1484 
    +            assert utils._is_main_process(), \
    1485 
    +                "Attempted to save workspace configuration from child process"
    1483 1486 
                 #
    1484 1487 
                 # Note that this block can only happen in the
    1485 
    -            # main process, since `self._cached()` cannot
    1486 
    -            # be true when assembly is completed in the task.
    1488 
    +            # main process, since `self._cached_success()` cannot
    1489 
    +            # be true when assembly is successful in the task.
    1487 1490 
                 #
    1488 1491 
                 # For this reason, it is safe to update and
    1489 1492 
                 # save the workspaces configuration
    ... ... @@ -2147,17 +2150,18 @@ class Element(Plugin):
    2147 2150 
         #    stdout (fileobject): The stream for stdout for the sandbox
    2148 2151 
         #    stderr (fileobject): The stream for stderr for the sandbox
    2149 2152 
         #    config (SandboxConfig): The SandboxConfig object
    2153 
    +    #    allow_remote (bool): Whether the sandbox is allowed to be remote
    2150 2154 
         #
    2151 2155 
         # Yields:
    2152 2156 
         #    (Sandbox): A usable sandbox
    2153 2157 
         #
    2154 2158 
         @contextmanager
    2155 
    -    def __sandbox(self, directory, stdout=None, stderr=None, config=None):
    2159 
    +    def __sandbox(self, directory, stdout=None, stderr=None, config=None, allow_remote=True):
    2156 2160 
             context = self._get_context()
    2157 2161 
             project = self._get_project()
    2158 2162 
             platform = Platform.get_platform()
    2159 2163
    2160 
    -        if directory is not None and self.__use_remote_execution():
    2164 
    +        if directory is not None and allow_remote and self.__use_remote_execution():
    2161 2165
    2162 2166 
                 self.info("Using a remote sandbox for artifact {} with directory '{}'".format(self.name, directory))
    2163 2167
    ... ... @@ -2171,7 +2175,7 @@ class Element(Plugin):
    2171 2175 
                 yield sandbox
    2172 2176
    2173 2177 
             elif directory is not None and os.path.exists(directory):
    2174 
    -            if self.__remote_execution_url:
    2178 
    +            if allow_remote and self.__remote_execution_url:
    2175 2179 
                     self.warn("Artifact {} is configured to use remote execution but element plugin does not support it."
    2176 2180 
                               .format(self.name), detail="Element plugin '{kind}' does not support virtual directories."
    2177 2181 
                               .format(kind=self.get_kind()), warning_token="remote-failure")
    ... ... @@ -2191,7 +2195,8 @@ class Element(Plugin):
    2191 2195 
                 rootdir = tempfile.mkdtemp(prefix="{}-".format(self.normal_name), dir=context.builddir)
    2192 2196
    2193 2197 
                 # Recursive contextmanager...
    2194 
    -            with self.__sandbox(rootdir, stdout=stdout, stderr=stderr, config=config) as sandbox:
    2198 
    +            with self.__sandbox(rootdir, stdout=stdout, stderr=stderr, config=config,
    2199 
    +                                allow_remote=allow_remote) as sandbox:
    2195 2200 
                     yield sandbox
    2196 2201
    2197 2202 
                 # Cleanup the build dir

  • buildstream/plugins/sources/git.py
    ... ... @@ -184,10 +184,18 @@ class GitMirror(SourceFetcher):
    184 184 
                              cwd=self.mirror)
    185 185
    186 186 
         def fetch(self, alias_override=None):
    187 
    -        self.ensure(alias_override)
    188 
    -        if not self.has_ref():
    189 
    -            self._fetch(alias_override)
    190 
    -        self.assert_ref()
    187 
    +        # Resolve the URL for the message
    188 
    +        resolved_url = self.source.translate_url(self.url,
    189 
    +                                                 alias_override=alias_override,
    190 
    +                                                 primary=self.primary)
    191 
    +
    192 
    +        with self.source.timed_activity("Fetching from {}"
    193 
    +                                        .format(resolved_url),
    194 
    +                                        silent_nested=True):
    195 
    +            self.ensure(alias_override)
    196 
    +            if not self.has_ref():
    197 
    +                self._fetch(alias_override)
    198 
    +            self.assert_ref()
    191 199
    192 200 
         def has_ref(self):
    193 201 
             if not self.ref:

  • buildstream/sandbox/_sandboxdummy.py
    ... ... @@ -23,6 +23,7 @@ from . import Sandbox
    23 23 
     class SandboxDummy(Sandbox):
    24 24 
         def __init__(self, *args, **kwargs):
    25 25 
             super().__init__(*args, **kwargs)
    26 
    +        self._reason = kwargs.get("dummy_reason", "no reason given")
    26 27
    27 28 
         def run(self, command, flags, *, cwd=None, env=None):
    28 29
    ... ... @@ -37,4 +38,4 @@ class SandboxDummy(Sandbox):
    37 38 
                                    "'{}'".format(command[0]),
    38 39 
                                    reason='missing-command')
    39 40
    40 
    -        raise SandboxError("This platform does not support local builds")
    41 
    +        raise SandboxError("This platform does not support local builds: {}".format(self._reason))

  • buildstream/sandbox/_sandboxremote.py
    ... ... @@ -177,15 +177,11 @@ class SandboxRemote(Sandbox):
    177 177 
             if not cascache.verify_digest_pushed(self._get_project(), upload_vdir.ref):
    178 178 
                 raise SandboxError("Failed to verify that source has been pushed to the remote artifact cache.")
    179 179
    180 
    -        # Set up environment and working directory
    181 
    -        if cwd is None:
    182 
    -            cwd = self._get_work_directory()
    183 
    -
    184 
    -        if cwd is None:
    185 
    -            cwd = '/'
    186 
    -
    187 
    -        if env is None:
    188 
    -            env = self._get_environment()
    180 
    +        # Fallback to the sandbox default settings for
    181 
    +        # the cwd and env.
    182 
    +        #
    183 
    +        cwd = self._get_work_directory(cwd=cwd)
    184 
    +        env = self._get_environment(cwd=cwd, env=env)
    189 185
    190 186 
             # We want command args as a list of strings
    191 187 
             if isinstance(command, str):

  • buildstream/source.py
    ... ... @@ -965,28 +965,48 @@ class Source(Plugin):
    965 965 
         # Tries to call fetch for every mirror, stopping once it succeeds
    966 966 
         def __do_fetch(self, **kwargs):
    967 967 
             project = self._get_project()
    968 
    -        source_fetchers = self.get_source_fetchers()
    968 
    +        context = self._get_context()
    969 
    +
    970 
    +        # Silence the STATUS messages which might happen as a result
    971 
    +        # of checking the source fetchers.
    972 
    +        with context.silence():
    973 
    +            source_fetchers = self.get_source_fetchers()
    969 974
    970 975 
             # Use the source fetchers if they are provided
    971 976 
             #
    972 977 
             if source_fetchers:
    973 
    -            for fetcher in source_fetchers:
    974 
    -                alias = fetcher._get_alias()
    975 
    -                for uri in project.get_alias_uris(alias, first_pass=self.__first_pass):
    976 
    -                    try:
    977 
    -                        fetcher.fetch(uri)
    978 
    -                    # FIXME: Need to consider temporary vs. permanent failures,
    979 
    -                    #        and how this works with retries.
    980 
    -                    except BstError as e:
    981 
    -                        last_error = e
    982 
    -                        continue
    983 
    -
    984 
    -                    # No error, we're done with this fetcher
    985 
    -                    break
    986 978
    987 
    -                else:
    988 
    -                    # No break occurred, raise the last detected error
    989 
    -                    raise last_error
    979 
    +            # Use a contorted loop here, this is to allow us to
    980 
    +            # silence the messages which can result from consuming
    981 
    +            # the items of source_fetchers, if it happens to be a generator.
    982 
    +            #
    983 
    +            source_fetchers = iter(source_fetchers)
    984 
    +            try:
    985 
    +
    986 
    +                while True:
    987 
    +
    988 
    +                    with context.silence():
    989 
    +                        fetcher = next(source_fetchers)
    990 
    +
    991 
    +                    alias = fetcher._get_alias()
    992 
    +                    for uri in project.get_alias_uris(alias, first_pass=self.__first_pass):
    993 
    +                        try:
    994 
    +                            fetcher.fetch(uri)
    995 
    +                        # FIXME: Need to consider temporary vs. permanent failures,
    996 
    +                        #        and how this works with retries.
    997 
    +                        except BstError as e:
    998 
    +                            last_error = e
    999 
    +                            continue
    1000 
    +
    1001 
    +                        # No error, we're done with this fetcher
    1002 
    +                        break
    1003 
    +
    1004 
    +                    else:
    1005 
    +                        # No break occurred, raise the last detected error
    1006 
    +                        raise last_error
    1007 
    +
    1008 
    +            except StopIteration:
    1009 
    +                pass
    990 1010
    991 1011 
             # Default codepath is to reinstantiate the Source
    992 1012 
             #

  • buildstream/utils.py
    ... ... @@ -502,7 +502,7 @@ def get_bst_version():
    502 502
    503 503 
     @contextmanager
    504 504 
     def save_file_atomic(filename, mode='w', *, buffering=-1, encoding=None,
    505 
    -                     errors=None, newline=None, closefd=True, opener=None):
    505 
    +                     errors=None, newline=None, closefd=True, opener=None, tempdir=None):
    506 506 
         """Save a file with a temporary name and rename it into place when ready.
    507 507
    508 508 
         This is a context manager which is meant for saving data to files.
    ... ... @@ -529,8 +529,9 @@ def save_file_atomic(filename, mode='w', *, buffering=-1, encoding=None,
    529 529 
         # https://bugs.python.org/issue8604
    530 530
    531 531 
         assert os.path.isabs(filename), "The utils.save_file_atomic() parameter ``filename`` must be an absolute path"
    532 
    -    dirname = os.path.dirname(filename)
    533 
    -    fd, tempname = tempfile.mkstemp(dir=dirname)
    532 
    +    if tempdir is None:
    533 
    +        tempdir = os.path.dirname(filename)
    534 
    +    fd, tempname = tempfile.mkstemp(dir=tempdir)
    534 535 
         os.close(fd)
    535 536
    536 537 
         f = open(tempname, mode=mode, buffering=buffering, encoding=encoding,
    ... ... @@ -562,6 +563,9 @@ def save_file_atomic(filename, mode='w', *, buffering=-1, encoding=None,
    562 563 
     #
    563 564 
     # Get the disk usage of a given directory in bytes.
    564 565 
     #
    566 
    +# This function assumes that files do not inadvertantly
    567 
    +# disappear while this function is running.
    568 
    +#
    565 569 
     # Arguments:
    566 570 
     #     (str) The path whose size to check.
    567 571 
     #
    ... ... @@ -682,7 +686,7 @@ def _force_rmtree(rootpath, **kwargs):
    682 686
    683 687 
         try:
    684 688 
             shutil.rmtree(rootpath, **kwargs)
    685 
    -    except shutil.Error as e:
    689 
    +    except OSError as e:
    686 690 
             raise UtilError("Failed to remove cache directory '{}': {}"
    687 691 
                             .format(rootpath, e))
    688 692

  • contrib/bst-docker-import
    1 
    +#!/bin/bash
    2 
    +#
    3 
    +#  Copyright 2018 Bloomberg Finance LP
    4 
    +#
    5 
    +#  This program is free software; you can redistribute it and/or
    6 
    +#  modify it under the terms of the GNU Lesser General Public
    7 
    +#  License as published by the Free Software Foundation; either
    8 
    +#  version 2 of the License, or (at your option) any later version.
    9 
    +#
    10 
    +#  This library is distributed in the hope that it will be useful,
    11 
    +#  but WITHOUT ANY WARRANTY; without even the implied warranty of
    12 
    +#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    13 
    +#  Lesser General Public License for more details.
    14 
    +#
    15 
    +#  You should have received a copy of the GNU Lesser General Public
    16 
    +#  License along with this library. If not, see <http://www.gnu.org/licenses/>.
    17 
    +#
    18 
    +#  Authors:
    19 
    +#        Chadnan Singh <csingh43 bloomberg net>
    20 
    +
    21 
    +# This is a helper script to generate Docker images using checkouts of
    22 
    +# BuildStream elements.
    23 
    +
    24 
    +usage() {
    25 
    +    cat <<EOF
    26 
    +
    27 
    +USAGE: $(basename "$0") [-c BST_CMD] [-m MESSAGE] [-t TAG] [-h] ELEMENT
    28 
    +
    29 
    +Create a Docker image from bst checkout of an element.
    30 
    +
    31 
    +OPTIONS:
    32 
    +    -c BST_CMD    Path to BuildStream command (default: bst).
    33 
    +    -m MESSAGE    Commit message for the imported image.
    34 
    +    -t TAG        Tag of the imported image.
    35 
    +    -h            Print this help text and exit.
    36 
    +
    37 
    +EXAMPLES:
    38 
    +
    39 
    +    # Import hello.bst as a Docker image with tag "bst-hello" and message "hello"
    40 
    +    $(basename "$0") -m hello -t bst-hello hello.bst
    41 
    +
    42 
    +    # Import hello.bst as a Docker image with tag "bst-hello" using bst-here
    43 
    +    $(basename "$0") -c bst-here -t bst-hello hello.bst
    44 
    +
    45 
    +EOF
    46 
    +    exit "$1"
    47 
    +}
    48 
    +
    49 
    +die() {
    50 
    +    echo "FATAL: $1" >&2
    51 
    +    exit 1
    52 
    +}
    53 
    +
    54 
    +bst_cmd=bst
    55 
    +docker_import_cmd=(docker import)
    56 
    +docker_image_tag=
    57 
    +
    58 
    +while getopts c:m:t:h arg
    59 
    +do
    60 
    +    case $arg in
    61 
    +    c)
    62 
    +        bst_cmd="$OPTARG"
    63 
    +        ;;
    64 
    +    m)
    65 
    +        docker_import_cmd+=('-m' "$OPTARG")
    66 
    +        ;;
    67 
    +    t)
    68 
    +        docker_image_tag="$OPTARG"
    69 
    +        ;;
    70 
    +    h)
    71 
    +        usage 0
    72 
    +        ;;
    73 
    +    \?)
    74 
    +        usage 1
    75 
    +    esac
    76 
    +done
    77 
    +
    78 
    +shift $((OPTIND-1))
    79 
    +if [[ "$#" != 1 ]]; then
    80 
    +    echo "$0: No element specified" >&2
    81 
    +    usage 1
    82 
    +fi
    83 
    +element="$1"
    84 
    +
    85 
    +# Dump to a temporary file in the current directory.
    86 
    +# NOTE: We use current directory to try to ensure compatibility with scripts
    87 
    +# like bst-here, assuming that the current working directory is mounted
    88 
    +# inside the container.
    89 
    +
    90 
    +checkout_tar="bst-checkout-$(basename "$element")-$RANDOM.tar"
    91 
    +
    92 
    +echo "INFO: Checking out $element ..." >&2
    93 
    +$bst_cmd checkout --tar "$element" "$checkout_tar" || die "Failed to checkout $element"
    94 
    +echo "INFO: Successfully checked out $element" >&2
    95 
    +
    96 
    +echo "INFO: Importing Docker image ..." >&2
    97 
    +"${docker_import_cmd[@]}" "$checkout_tar" "$docker_image_tag" || die "Failed to import Docker image from tarball"
    98 
    +echo "INFO: Successfully import Docker image $docker_image_tag" >&2
    99 
    +
    100 
    +echo "INFO: Cleaning up ..." >&2
    101 
    +rm "$checkout_tar" || die "Failed to remove $checkout_tar"
    102 
    +echo "INFO: Clean up finished" >&2

  • doc/source/additional_docker.rst
    1 
    +
    2 
    +.. _bst_and_docker:
    3 
    +
    4 
    +
    5 
    +BuildStream and Docker
    6 
    +======================
    7 
    +
    8 
    +BuildStream integrates with Docker in multiple ways. Here are some ways in
    9 
    +which these integrations work.
    10 
    +
    11 
    +Run BuildStream inside Docker
    12 
    +-----------------------------
    13 
    +
    14 
    +Refer to the :ref:`BuildStream inside Docker <docker>` documentation for
    15 
    +instructions on how to run BuildStream as a Docker container.
    16 
    +
    17 
    +Generate Docker images
    18 
    +----------------------
    19 
    +
    20 
    +The
    21 
    +`bst-docker-import script <https://gitlab.com/BuildStream/buildstream/blob/master/contrib/bst-docker-import>`_
    22 
    +can be used to generate a Docker image from built artifacts.
    23 
    +
    24 
    +You can download it and make it executable like this:
    25 
    +
    26 
    +.. code:: bash
    27 
    +
    28 
    +  mkdir -p ~/.local/bin
    29 
    +  curl --get https://gitlab.com/BuildStream/buildstream/raw/master/contrib/bst-docker-import > ~/.local/bin/bst-docker-import
    30 
    +  chmod +x ~/.local/bin/bst-docker-import
    31 
    +
    32 
    +Check if ``~/.local/bin`` appears in your PATH environment variable -- if it
    33 
    +doesn't, you should
    34 
    +`edit your ~/.profile so that it does <https://stackoverflow.com/questions/14637979/>`_.
    35 
    +
    36 
    +Once the script is available in your PATH and assuming you have Docker
    37 
    +installed, you can start using the ``bst-docker-import`` script. Here is a
    38 
    +minimal example to generate an image called ``bst-hello`` from an element
    39 
    +called ``hello.bst`` assuming it is already built:
    40 
    +
    41 
    +.. code:: bash
    42 
    +
    43 
    +  bst-docker-import -t bst-hello hello.bst
    44 
    +
    45 
    +This script can also be used if you are running BuildStream inside Docker. In
    46 
    +this case, you will need to supply the command that you are using to run
    47 
    +BuildStream using the ``-c`` option.  If you are using the
    48 
    +`bst-here wrapper script <https://gitlab.com/BuildStream/buildstream/blob/master/contrib/bst-here>`_,
    49 
    +you can achieve the same results as the above example like this:
    50 
    +
    51 
    +.. code:: bash
    52 
    +
    53 
    +  bst-docker-import -c bst-here -t bst-hello hello.bst

  • doc/source/core_additional.rst
    ... ... @@ -8,3 +8,4 @@ Additional writings
    8 8
    9 9 
        additional_cachekeys
    10 10 
        additional_sandboxing
    11 
    +   additional_docker

  • setup.py
    ... ... @@ -54,12 +54,13 @@ REQUIRED_BWRAP_MINOR = 1
    54 54 
     REQUIRED_BWRAP_PATCH = 2
    55 55
    56 56
    57 
    -def exit_bwrap(reason):
    57 
    +def warn_bwrap(reason):
    58 58 
         print(reason +
    59 
    -          "\nBuildStream requires Bubblewrap (bwrap) for"
    60 
    -          " sandboxing the build environment. Install it using your package manager"
    61 
    -          " (usually bwrap or bubblewrap)")
    62 
    -    sys.exit(1)
    59 
    +          "\nBuildStream requires Bubblewrap (bwrap {}.{}.{} or better),"
    60 
    +          " during local builds, for"
    61 
    +          " sandboxing the build environment.\nInstall it using your package manager"
    62 
    +          " (usually bwrap or bubblewrap) otherwise you will be limited to"
    63 
    +          " remote builds only.".format(REQUIRED_BWRAP_MAJOR, REQUIRED_BWRAP_MINOR, REQUIRED_BWRAP_PATCH))
    63 64
    64 65
    65 66 
     def bwrap_too_old(major, minor, patch):
    ... ... @@ -76,18 +77,19 @@ def bwrap_too_old(major, minor, patch):
    76 77 
             return False
    77 78
    78 79
    79 
    -def assert_bwrap():
    80 
    +def check_for_bwrap():
    80 81 
         platform = os.environ.get('BST_FORCE_BACKEND', '') or sys.platform
    81 82 
         if platform.startswith('linux'):
    82 83 
             bwrap_path = shutil.which('bwrap')
    83 84 
             if not bwrap_path:
    84 
    -            exit_bwrap("Bubblewrap not found")
    85 
    +            warn_bwrap("Bubblewrap not found")
    86 
    +            return
    85 87
    86 88 
             version_bytes = subprocess.check_output([bwrap_path, "--version"]).split()[1]
    87 89 
             version_string = str(version_bytes, "utf-8")
    88 90 
             major, minor, patch = map(int, version_string.split("."))
    89 91 
             if bwrap_too_old(major, minor, patch):
    90 
    -            exit_bwrap("Bubblewrap too old")
    92 
    +            warn_bwrap("Bubblewrap too old")
    91 93
    92 94
    93 95 
     ###########################################
    ... ... @@ -126,7 +128,7 @@ bst_install_entry_points = {
    126 128 
     }
    127 129
    128 130 
     if not os.environ.get('BST_ARTIFACTS_ONLY', ''):
    129 
    -    assert_bwrap()
    131 
    +    check_for_bwrap()
    130 132 
         bst_install_entry_points['console_scripts'] += [
    131 133 
             'bst = buildstream._frontend:cli'
    132 134 
         ]

  • tests/frontend/mirror.py
    ... ... @@ -139,6 +139,82 @@ def test_mirror_fetch(cli, tmpdir, datafiles, kind):
    139 139 
         result.assert_success()
    140 140
    141 141
    142 
    +@pytest.mark.datafiles(DATA_DIR)
    143 
    +@pytest.mark.parametrize("ref_storage", [("inline"), ("project.refs")])
    144 
    +@pytest.mark.parametrize("mirror", [("no-mirror"), ("mirror"), ("unrelated-mirror")])
    145 
    +def test_mirror_fetch_ref_storage(cli, tmpdir, datafiles, ref_storage, mirror):
    146 
    +    bin_files_path = os.path.join(str(datafiles), 'files', 'bin-files', 'usr')
    147 
    +    dev_files_path = os.path.join(str(datafiles), 'files', 'dev-files', 'usr')
    148 
    +    upstream_repodir = os.path.join(str(tmpdir), 'upstream')
    149 
    +    mirror_repodir = os.path.join(str(tmpdir), 'mirror')
    150 
    +    project_dir = os.path.join(str(tmpdir), 'project')
    151 
    +    os.makedirs(project_dir)
    152 
    +    element_dir = os.path.join(project_dir, 'elements')
    153 
    +
    154 
    +    # Create repo objects of the upstream and mirror
    155 
    +    upstream_repo = create_repo('tar', upstream_repodir)
    156 
    +    upstream_ref = upstream_repo.create(bin_files_path)
    157 
    +    mirror_repo = upstream_repo.copy(mirror_repodir)
    158 
    +    mirror_ref = upstream_ref
    159 
    +    upstream_ref = upstream_repo.create(dev_files_path)
    160 
    +
    161 
    +    element = {
    162 
    +        'kind': 'import',
    163 
    +        'sources': [
    164 
    +            upstream_repo.source_config(ref=upstream_ref if ref_storage == 'inline' else None)
    165 
    +        ]
    166 
    +    }
    167 
    +    element_name = 'test.bst'
    168 
    +    element_path = os.path.join(element_dir, element_name)
    169 
    +    full_repo = element['sources'][0]['url']
    170 
    +    upstream_map, repo_name = os.path.split(full_repo)
    171 
    +    alias = 'foo'
    172 
    +    aliased_repo = alias + ':' + repo_name
    173 
    +    element['sources'][0]['url'] = aliased_repo
    174 
    +    full_mirror = mirror_repo.source_config()['url']
    175 
    +    mirror_map, _ = os.path.split(full_mirror)
    176 
    +    os.makedirs(element_dir)
    177 
    +    _yaml.dump(element, element_path)
    178 
    +
    179 
    +    if ref_storage == 'project.refs':
    180 
    +        # Manually set project.refs to avoid caching the repo prematurely
    181 
    +        project_refs = {'projects': {
    182 
    +            'test': {
    183 
    +                element_name: [
    184 
    +                    {'ref': upstream_ref}
    185 
    +                ]
    186 
    +            }
    187 
    +        }}
    188 
    +        project_refs_path = os.path.join(project_dir, 'project.refs')
    189 
    +        _yaml.dump(project_refs, project_refs_path)
    190 
    +
    191 
    +    project = {
    192 
    +        'name': 'test',
    193 
    +        'element-path': 'elements',
    194 
    +        'aliases': {
    195 
    +            alias: upstream_map + "/"
    196 
    +        },
    197 
    +        'ref-storage': ref_storage
    198 
    +    }
    199 
    +    if mirror != 'no-mirror':
    200 
    +        mirror_data = [{
    201 
    +            'name': 'middle-earth',
    202 
    +            'aliases': {alias: [mirror_map + '/']}
    203 
    +        }]
    204 
    +        if mirror == 'unrelated-mirror':
    205 
    +            mirror_data.insert(0, {
    206 
    +                'name': 'narnia',
    207 
    +                'aliases': {'frob': ['http://www.example.com/repo']}
    208 
    +            })
    209 
    +        project['mirrors'] = mirror_data
    210 
    +
    211 
    +    project_file = os.path.join(project_dir, 'project.conf')
    212 
    +    _yaml.dump(project, project_file)
    213 
    +
    214 
    +    result = cli.run(project=project_dir, args=['fetch', element_name])
    215 
    +    result.assert_success()
    216 
    +
    217 
    +
    142 218 
     @pytest.mark.datafiles(DATA_DIR)
    143 219 
     @pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS])
    144 220 
     def test_mirror_fetch_upstream_absent(cli, tmpdir, datafiles, kind):

  • tests/frontend/workspace.py
    ... ... @@ -43,7 +43,8 @@ DATA_DIR = os.path.join(
    43 43 
     )
    44 44
    45 45
    46 
    -def open_workspace(cli, tmpdir, datafiles, kind, track, suffix='', workspace_dir=None, project_path=None):
    46 
    +def open_workspace(cli, tmpdir, datafiles, kind, track, suffix='', workspace_dir=None,
    47 
    +                   project_path=None, element_attrs=None):
    47 48 
         if not workspace_dir:
    48 49 
             workspace_dir = os.path.join(str(tmpdir), 'workspace{}'.format(suffix))
    49 50 
         if not project_path:
    ... ... @@ -69,6 +70,8 @@ def open_workspace(cli, tmpdir, datafiles, kind, track, suffix='', workspace_dir
    69 70 
                 repo.source_config(ref=ref)
    70 71 
             ]
    71 72 
         }
    73 
    +    if element_attrs:
    74 
    +        element = {**element, **element_attrs}
    72 75 
         _yaml.dump(element,
    73 76 
                    os.path.join(element_path,
    74 77 
                                 element_name))
    ... ... @@ -854,3 +857,22 @@ def test_cache_key_workspace_in_dependencies(cli, tmpdir, datafiles, strict):
    854 857
    855 858 
         # Check that the original /usr/bin/hello is not in the checkout
    856 859 
         assert not os.path.exists(os.path.join(checkout, 'usr', 'bin', 'hello'))
    860 
    +
    861 
    +
    862 
    +@pytest.mark.datafiles(DATA_DIR)
    863 
    +def test_multiple_failed_builds(cli, tmpdir, datafiles):
    864 
    +    element_config = {
    865 
    +        "kind": "manual",
    866 
    +        "config": {
    867 
    +            "configure-commands": [
    868 
    +                "unknown_command_that_will_fail"
    869 
    +            ]
    870 
    +        }
    871 
    +    }
    872 
    +    element_name, project, _ = open_workspace(cli, tmpdir, datafiles,
    873 
    +                                              "git", False, element_attrs=element_config)
    874 
    +
    875 
    +    for _ in range(2):
    876 
    +        result = cli.run(project=project, args=["build", element_name])
    877 
    +        assert "BUG" not in result.stderr
    878 
    +        assert cli.get_element_state(project, element_name) != "cached"

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.

    [Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]