[Notes] [Git][BuildStream/buildstream][abderrahim/artifact-cache-junctio

Abderrahim Kitouni pushed to branch abderrahim/artifact-cache-junction at BuildStream / buildstream

Commits:

5df4105a
by Angelos Evripiotis at 2019-01-28T10:13:40Z
```
news: fix 'osbolete' spelling
```

9c981eff

by Angelos Evripiotis at 2019-01-28T10:17:57Z

Fixup refs to 'bst track'

Now that 'bst track' is obsolete, change guidance to refer to the
replacement 'bst source track' instead.

bef80291

by Angelos Evripiotis at 2019-01-28T10:19:17Z

Fixup refs to 'bst fetch'

Now that 'bst fetch' is obsolete, change guidance to refer to the
replacement 'bst source fetch' instead.

564cb245

by Angelos Evripiotis at 2019-01-28T11:36:16Z

Merge branch 'aevri/bst_track_guidance' into 'master'

Fixup refs to 'bst track' and 'bst fetch'

See merge request BuildStream/buildstream!1086

9d9f6e76

by Abderrahim Kitouni at 2019-01-28T13:38:26Z

_artifactcache.py: don't leak the project specific remote caches

the code for initializing remotes added the project specific remote
caches to the global list instead of making a copy.

459598bb

by Abderrahim Kitouni at 2019-01-28T13:38:26Z

_project.py: use artifact caches from the parent project for junctions

This makes a junction use the artifact cache of the parent project
before the ones defined for the junction

Fixes #401

Changes:

NEWS

@@ -20,7 +20,7 @@ buildstream 1.3.1
      an element's sources and generated build scripts you can do the command
      `bst source-checkout --include-build-scripts --tar foo.bst some-file.tar`
 -  o BREAKING CHANGE: `bst track` and `bst fetch` commands are now osbolete.
 +  o BREAKING CHANGE: `bst track` and `bst fetch` commands are now obsolete.
      Their functionality is provided by `bst source track` and
      `bst source fetch` respectively.

buildstream/_artifactcache.py

@@ -467,7 +467,7 @@ class ArtifactCache():
      #     on_failure (callable): Called if we fail to contact one of the caches.
+     #
      def initialize_remotes(self, *, on_failure=None):
 -        remote_specs = self.global_remote_specs
 +        remote_specs = list(self.global_remote_specs)
          for project in self.project_remote_specs:
              remote_specs += self.project_remote_specs[project]
@@ -1046,8 +1046,5 @@ class ArtifactCache():
  #   A list of ArtifactCacheSpec instances describing the remote artifact caches.
+ #
  def _configured_remote_artifact_cache_specs(context, project):
 -    project_overrides = context.get_overrides(project.name)
 -    project_extra_specs = ArtifactCache.specs_from_config_node(project_overrides)
+-
      return list(utils._deduplicate(
 -        project_extra_specs + project.artifact_cache_specs + context.artifact_cache_specs))
 +        project.artifact_cache_specs + context.artifact_cache_specs))

buildstream/_gitsourcebase.py

@@ -605,7 +605,7 @@ class _GitSourceBase(Source):
                  detail = "The ref provided for the element does not exist locally " + \
                           "in the provided track branch / tag '{}'.\n".format(self.tracking) + \
                           "You may wish to track the element to update the ref from '{}' ".format(self.tracking) + \
 -                         "with `bst track`,\n" + \
 +                         "with `bst source track`,\n" + \
                           "or examine the upstream at '{}' for the specific ref.".format(self.mirror.url)
                  self.warn("{}: expected ref '{}' was not found in given track '{}' for staged repository: '{}'\n"

buildstream/_loader/loader.py

@@ -557,7 +557,7 @@ class Loader():
                          ticker(filename, 'Fetching subproject from {} source'.format(source.get_kind()))
                      source._fetch(sources[0:idx])
                  else:
 -                    detail = "Try fetching the project with `bst fetch {}`".format(filename)
 +                    detail = "Try fetching the project with `bst source fetch {}`".format(filename)
                      raise LoadError(LoadErrorReason.SUBPROJECT_FETCH_NEEDED,
                                      "Subproject fetch needed for junction: {}".format(filename),
                                      detail=detail)
@@ -565,7 +565,7 @@ class Loader():
              # Handle the case where a subproject has no ref
+             #
              elif source.get_consistency() == Consistency.INCONSISTENT:
 -                detail = "Try tracking the junction element with `bst track {}`".format(filename)
 +                detail = "Try tracking the junction element with `bst source track {}`".format(filename)
                  raise LoadError(LoadErrorReason.SUBPROJECT_INCONSISTENT,
                                  "Subproject has no ref for junction: {}".format(filename),
                                  detail=detail)

buildstream/_pipeline.py

@@ -373,7 +373,7 @@ class Pipeline():
                      if source._get_consistency() == Consistency.INCONSISTENT:
                          detail += "    {} is missing ref\n".format(source)
                  detail += '\n'
 -            detail += "Try tracking these elements first with `bst track`\n"
 +            detail += "Try tracking these elements first with `bst source track`\n"
              raise PipelineError("Inconsistent pipeline", detail=detail, reason="inconsistent-pipeline")
@@ -406,7 +406,7 @@ class Pipeline():
                      if source._get_consistency() != Consistency.CACHED:
                          detail += "    {}\n".format(source)
                  detail += '\n'
 -            detail += "Try fetching these elements first with `bst fetch`,\n" + \
 +            detail += "Try fetching these elements first with `bst source fetch`,\n" + \
                        "or run this command with `--fetch` option\n"
              raise PipelineError("Uncached sources", detail=detail, reason="uncached-sources")

buildstream/_project.py

@@ -549,7 +549,15 @@ class Project():
+         #
          # Load artifacts pull/push configuration for this project
 -        self.artifact_cache_specs = ArtifactCache.specs_from_config_node(config, self.directory)
 +        project_specs = ArtifactCache.specs_from_config_node(config, self.directory)
 +        override_specs = ArtifactCache.specs_from_config_node(
 +            self._context.get_overrides(self.name), self.directory)
++
 +        self.artifact_cache_specs = override_specs + project_specs
++
 +        if self.junction:
 +            parent = self.junction._get_project()
 +            self.artifact_cache_specs = parent.artifact_cache_specs + self.artifact_cache_specs
          # Load remote-execution configuration for this project
          project_specs = SandboxRemote.specs_from_config_node(config, self.directory)

buildstream/plugins/elements/junction.py

@@ -79,7 +79,7 @@ depend on a junction element itself.
     Therefore, if you require the most up-to-date version of a subproject,
     you must explicitly track the junction element by invoking:
 -   `bst track JUNCTION_ELEMENT`.
 +   `bst source track JUNCTION_ELEMENT`.
     Furthermore, elements within the subproject are also not tracked by default.
     For this, we must specify the `--track-cross-junctions` option. This option
@@ -93,7 +93,7 @@ cached yet. However, they can be fetched explicitly:
  .. code::
 -   bst fetch junction.bst
 +   bst source fetch junction.bst
  Other commands such as ``bst build`` implicitly fetch junction sources.
@@ -146,7 +146,7 @@ class JunctionElement(Element):
      def get_unique_key(self):
          # Junctions do not produce artifacts. get_unique_key() implementation
 -        # is still required for `bst fetch`.
 +        # is still required for `bst source fetch`.
          return 1
      def configure_sandbox(self, sandbox):

buildstream/plugins/sources/bzr.py

@@ -46,7 +46,7 @@ bzr - stage files from a bazaar repository
     # but revisions on a branch are of the form
     # <revision-branched-from>.<branch-number>.<revision-since-branching>
     # e.g. 6622.1.6.
 -   # The ref must be specified to build, and 'bst track' will update the
 +   # The ref must be specified to build, and 'bst source track' will update the
     # revision number to the one on the tip of the branch specified in 'track'.
     ref: 6622

buildstream/plugins/sources/deb.py

@@ -34,7 +34,7 @@ deb - stage files from .deb packages
     kind: deb
     # Specify the deb url. Using an alias defined in your project
 -   # configuration is encouraged. 'bst track' will update the
 +   # configuration is encouraged. 'bst source track' will update the
     # sha256sum in 'ref' to the downloaded file's sha256sum.
     url: upstream:foo.deb

buildstream/plugins/sources/git.py

@@ -112,7 +112,7 @@ git - stage files from a git repository
     #     o Enable `track-tags` feature
     #     o Set the `track` parameter to the desired commit sha which
     #       the current `ref` points to
 -   #     o Run `bst track` for these elements, this will result in
 +   #     o Run `bst source track` for these elements, this will result in
     #       populating the `tags` portion of the refs without changing
     #       the refs
     #     o Restore the `track` parameter to the branches which you have

buildstream/plugins/sources/remote.py

@@ -37,7 +37,7 @@ remote - stage files from remote urls
     # executable: true
     # Specify the url. Using an alias defined in your project
 -   # configuration is encouraged. 'bst track' will update the
 +   # configuration is encouraged. 'bst source track' will update the
     # sha256sum in 'ref' to the downloaded file's sha256sum.
     url: upstream:foo

buildstream/plugins/sources/tar.py

@@ -33,7 +33,7 @@ tar - stage files from tar archives
     kind: tar
     # Specify the tar url. Using an alias defined in your project
 -   # configuration is encouraged. 'bst track' will update the
 +   # configuration is encouraged. 'bst source track' will update the
     # sha256sum in 'ref' to the downloaded file's sha256sum.
     url: upstream:foo.tar

buildstream/plugins/sources/zip.py

@@ -29,7 +29,7 @@ zip - stage files from zip archives
     kind: zip
     # Specify the zip url. Using an alias defined in your project
 -   # configuration is encouraged. 'bst track' will update the
 +   # configuration is encouraged. 'bst source track' will update the
     # sha256sum in 'ref' to the downloaded file's sha256sum.
     url: upstream:foo.zip

doc/source/format_project_refs.rst

@@ -21,9 +21,9 @@ When a ``project.refs`` file is in use, any source references found
  in the :ref:`inline source declarations <format_sources>` are considered
  invalid and will be ignored, and a warning will be emitted for them.
 -When ``bst track`` is run for your project, the ``project.refs`` file
 +When ``bst source track`` is run for your project, the ``project.refs`` file
  will be updated instead of the inline source declarations. In the absence
 -of a ``project.refs`` file, ``bst track`` will create one automatically
 +of a ``project.refs`` file, ``bst source track`` will create one automatically
  with the tracking results.
  An interesting property of ``project.refs`` is that it allows for

tests/frontend/completions.py

@@ -160,7 +160,7 @@ def test_options(cli, cmd, word_idx, expected):
      ('bst show --deps b', 3, ['build ']),
      ('bst show --deps=b', 2, ['build ']),
      ('bst show --deps r', 3, ['run ']),
 -    ('bst track --deps ', 3, ['all ', 'none ']),
 +    ('bst source track --deps ', 4, ['all ', 'none ']),
  ])
  def test_option_choice(cli, cmd, word_idx, expected):
      assert_completion(cli, cmd, word_idx, expected)

[Notes] [Git][BuildStream/buildstream][abderrahim/artifact-cache-junction] 6 commits: news: fix 'osbolete' spelling

Abderrahim Kitouni pushed to branch abderrahim/artifact-cache-junction at BuildStream / buildstream

Commits:

15 changed files:

Changes: