You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by no...@apache.org on 2020/12/29 12:33:49 UTC
[buildstream] branch cache-key-v0 created (now d02151f)
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a change to branch cache-key-v0
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
at d02151f Revert "element.py: Consider execution environment in cache key"
This branch includes the following new commits:
new 0d4f939 Revert "tests/cachekey: Updating cache key test for new artifact version"
new ed546aa Revert "_project.py: Bumping artifact version for execution environment"
new d02151f Revert "element.py: Consider execution environment in cache key"
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[buildstream] 01/03: Revert "tests/cachekey: Updating cache key
test for new artifact version"
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch cache-key-v0
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 0d4f939769f4a9b01bf54edc6fcd7d0e11713df3
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Sun Feb 18 13:50:16 2018 +0100
Revert "tests/cachekey: Updating cache key test for new artifact version"
This reverts commit 8333af2f37ba928d62f17dca22079dfb50eb948d.
---
tests/cachekey/project/elements/build1.expected | 2 +-
tests/cachekey/project/elements/compose1.expected | 2 +-
tests/cachekey/project/elements/compose2.expected | 2 +-
tests/cachekey/project/elements/compose3.expected | 2 +-
tests/cachekey/project/elements/compose4.expected | 2 +-
tests/cachekey/project/elements/compose5.expected | 2 +-
tests/cachekey/project/elements/import1.expected | 2 +-
tests/cachekey/project/elements/import2.expected | 2 +-
tests/cachekey/project/elements/import3.expected | 2 +-
tests/cachekey/project/elements/script1.expected | 2 +-
tests/cachekey/project/sources/bzr1.expected | 2 +-
tests/cachekey/project/sources/git1.expected | 2 +-
tests/cachekey/project/sources/git2.expected | 2 +-
tests/cachekey/project/sources/local1.expected | 2 +-
tests/cachekey/project/sources/local2.expected | 2 +-
tests/cachekey/project/sources/ostree1.expected | 2 +-
tests/cachekey/project/sources/patch1.expected | 2 +-
tests/cachekey/project/sources/patch2.expected | 2 +-
tests/cachekey/project/sources/patch3.expected | 2 +-
tests/cachekey/project/sources/tar1.expected | 2 +-
tests/cachekey/project/sources/tar2.expected | 2 +-
tests/cachekey/project/sources/zip1.expected | 2 +-
tests/cachekey/project/sources/zip2.expected | 2 +-
tests/cachekey/project/target.expected | 2 +-
24 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected
index aeab7df..1e29315 100644
--- a/tests/cachekey/project/elements/build1.expected
+++ b/tests/cachekey/project/elements/build1.expected
@@ -1 +1 @@
-4fa7a6fd4c7a499208be4ce0deb26f7ae2fad3bfe2a0579f95207e01189731f4
\ No newline at end of file
+e8a2ab3deed52ed69987165606b5bf443998835ab3a3c0658e2ab879e9e8a1bb
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected
index 4255034..0456f0d 100644
--- a/tests/cachekey/project/elements/compose1.expected
+++ b/tests/cachekey/project/elements/compose1.expected
@@ -1 +1 @@
-b2c1793a0cac24d0338da922de2b4890a831fe98a67248e90f1ff350d140a78d
\ No newline at end of file
+b0286f805615fc91ae73a9116c8fc883d9e1a5bb210729b6b94d8294009be3c9
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected
index d328dc1..03c27cc 100644
--- a/tests/cachekey/project/elements/compose2.expected
+++ b/tests/cachekey/project/elements/compose2.expected
@@ -1 +1 @@
-95400860f5f65338faa533958403f9a39baaaa68a20ea62bf88b041042108228
\ No newline at end of file
+8699f4d8a38e3fd10ffb62adecfc1b4d9f0a11af0d8f995944be85a8865b48fb
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected
index bbb850f..b817555 100644
--- a/tests/cachekey/project/elements/compose3.expected
+++ b/tests/cachekey/project/elements/compose3.expected
@@ -1 +1 @@
-599097cc224cc8bb92a946de9a87cf3640e869957659af9027c6e4b8703fb2ef
\ No newline at end of file
+71949ed66f8df73eaec729454d6a9bfa995d13bbded1a00f38114971b263b625
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected
index 7f9a5f9..c62b226 100644
--- a/tests/cachekey/project/elements/compose4.expected
+++ b/tests/cachekey/project/elements/compose4.expected
@@ -1 +1 @@
-a2d0ac6ba12a706d6fc640502a42d17928796b549eb2d49103b5593d14bd5b2e
\ No newline at end of file
+c19b878121593c571a10e49367e1facfcaf92429fc75f41cb1e586ae9a052654
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected
index da569f2..0be542a 100644
--- a/tests/cachekey/project/elements/compose5.expected
+++ b/tests/cachekey/project/elements/compose5.expected
@@ -1 +1 @@
-6fd8485668c7028cc69f720b7fa3d8dbd47799a58ab2e943003af76d75723aca
\ No newline at end of file
+762200c41f7071bf957aced0b81748b975486c0ad127d6d1f0c166f253c715cd
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected
index c110aef..3ed617b 100644
--- a/tests/cachekey/project/elements/import1.expected
+++ b/tests/cachekey/project/elements/import1.expected
@@ -1 +1 @@
-40e28a44276c50a06d21a4e11815a0cd101e182f2a3e0d41c42aee8a3cc38083
\ No newline at end of file
+8714f5eef32174d6c6eb3c3934c758c35c180153def6fabc9fe69272c9512651
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected
index 1990fdb..d9b1b42 100644
--- a/tests/cachekey/project/elements/import2.expected
+++ b/tests/cachekey/project/elements/import2.expected
@@ -1 +1 @@
-b9812cfe17f497449f92c0b1e8e9dd34bcf9bec13241e98ae50cbdb45b8f585c
\ No newline at end of file
+45dd16e4c48b21f78239243f6264ccb56f5ae97c1b5082301b3c1ab059ad83a7
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected
index 2e266fe..623781e 100644
--- a/tests/cachekey/project/elements/import3.expected
+++ b/tests/cachekey/project/elements/import3.expected
@@ -1 +1 @@
-1908932c1c85d6a77f233cbdd0a811142e67e494ae35ceee47e0d847688d1fc2
\ No newline at end of file
+16f5ad9fc0d265a8c1014633367d6ee85ee1e6786f22d1d635e1138621ab4a4e
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected
index bdcdc75..de88d48 100644
--- a/tests/cachekey/project/elements/script1.expected
+++ b/tests/cachekey/project/elements/script1.expected
@@ -1 +1 @@
-465988b4812a13871f2c3e840a3b9ae6d95e04f2f0a5e4b5a61f45a8b3a4098d
\ No newline at end of file
+766715a30c8fedb00b85fd6c9d7ae8a42948c37956d05e2360225c2f133bfb71
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/bzr1.expected b/tests/cachekey/project/sources/bzr1.expected
index ed40727..c5d7ace 100644
--- a/tests/cachekey/project/sources/bzr1.expected
+++ b/tests/cachekey/project/sources/bzr1.expected
@@ -1 +1 @@
-253316463a7712921ec4095fc804728d38962ed8228a49e9c258b413d3c259da
\ No newline at end of file
+5b41eca4e0737fdfdd1424eb3662c2124f79993bf6dea97a4462e3f4df9b0d3d
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git1.expected b/tests/cachekey/project/sources/git1.expected
index e43c19d..0776100 100644
--- a/tests/cachekey/project/sources/git1.expected
+++ b/tests/cachekey/project/sources/git1.expected
@@ -1 +1 @@
-67244d16c75bde36f6b8d2aef49aa0896ab1b261cfd58e223d387f3cc6053c5a
\ No newline at end of file
+8a6cdbcbf6185d446f8d55d994356d59962539f7f671e3ebb11d11d61c160d65
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git2.expected b/tests/cachekey/project/sources/git2.expected
index 77f090c..7d1c2a6 100644
--- a/tests/cachekey/project/sources/git2.expected
+++ b/tests/cachekey/project/sources/git2.expected
@@ -1 +1 @@
-d8c6cfc83bad0419c1a35d5cf2af0e07b31519ded8f04aaa960d2d669da53541
\ No newline at end of file
+852b917a6e28abb53e1f2a04fc277d8f8fc1072b0561aade3550fcc90dfa5af3
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected
index c110aef..3ed617b 100644
--- a/tests/cachekey/project/sources/local1.expected
+++ b/tests/cachekey/project/sources/local1.expected
@@ -1 +1 @@
-40e28a44276c50a06d21a4e11815a0cd101e182f2a3e0d41c42aee8a3cc38083
\ No newline at end of file
+8714f5eef32174d6c6eb3c3934c758c35c180153def6fabc9fe69272c9512651
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected
index e90e004..4829282 100644
--- a/tests/cachekey/project/sources/local2.expected
+++ b/tests/cachekey/project/sources/local2.expected
@@ -1 +1 @@
-60f56c0ea299e36260f834b23aa3966fd727b2f4a3af5b8cd1830d89aa7357f8
\ No newline at end of file
+c9fb2fa9f97231f5e0d09aa37d579df48f638abd095832f3112f30b8e7a99683
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/ostree1.expected b/tests/cachekey/project/sources/ostree1.expected
index 12a92f1..976d577 100644
--- a/tests/cachekey/project/sources/ostree1.expected
+++ b/tests/cachekey/project/sources/ostree1.expected
@@ -1 +1 @@
-8990e4c3bf97e64b78cd81acf4d22d3e96bd04bacd7dedb20fb14276b8546165
\ No newline at end of file
+28510c0643d65d478368f9a94674b55038b51706fa278504b202267647e56496
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch1.expected b/tests/cachekey/project/sources/patch1.expected
index c1b4e6b..ddf93d0 100644
--- a/tests/cachekey/project/sources/patch1.expected
+++ b/tests/cachekey/project/sources/patch1.expected
@@ -1 +1 @@
-5213b528f286e8dd6b223167492ac04a89a57f3c3cc9953d4530c256297a0e7f
\ No newline at end of file
+4f58a38954577e223787c86509fda69ce7324ef7c1f964113759bb4ddde836b6
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch2.expected b/tests/cachekey/project/sources/patch2.expected
index 3f7d2a2..8131b2a 100644
--- a/tests/cachekey/project/sources/patch2.expected
+++ b/tests/cachekey/project/sources/patch2.expected
@@ -1 +1 @@
-06c3f3b9fb7739c05d0b8cf5275d385b84a08ce22ae5ee8d997faf0091b55ce9
\ No newline at end of file
+efef9710fd4cf622b448ea9cd6ec02c271a069f02e51dc64512702233ce9d368
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch3.expected b/tests/cachekey/project/sources/patch3.expected
index 52d7b6b..87e9e67 100644
--- a/tests/cachekey/project/sources/patch3.expected
+++ b/tests/cachekey/project/sources/patch3.expected
@@ -1 +1 @@
-91b51db2184a013cd05c17775949c1b5ceb55daccfa70a4b5d020674fbf248dd
\ No newline at end of file
+111c335c4ba0a24ae511a94ff0e8b78155c5c30838222e0d028ce66a46d8e7a8
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar1.expected b/tests/cachekey/project/sources/tar1.expected
index 34d07fc..769de89 100644
--- a/tests/cachekey/project/sources/tar1.expected
+++ b/tests/cachekey/project/sources/tar1.expected
@@ -1 +1 @@
-5f6e2d02c9927ed10a7095923d582a2eedb2b9988f74d5df3a334807c8dc3f9f
\ No newline at end of file
+ccbb0b9cdc18824ae3e377bec1eb1801da174c306097ed06a32ba607a5239228
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar2.expected b/tests/cachekey/project/sources/tar2.expected
index a2ea3a8..b8ef8c3 100644
--- a/tests/cachekey/project/sources/tar2.expected
+++ b/tests/cachekey/project/sources/tar2.expected
@@ -1 +1 @@
-98512664b1b7a41ee993d7d808a16eec12b39310dac64fc771ed4dd19d22f3a4
\ No newline at end of file
+0b3227cc859c7db8ca82f76784f89bd791890c835ddfbe5709f1a07ccb603550
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip1.expected b/tests/cachekey/project/sources/zip1.expected
index 8d4d996..f46bea2 100644
--- a/tests/cachekey/project/sources/zip1.expected
+++ b/tests/cachekey/project/sources/zip1.expected
@@ -1 +1 @@
-0b5672ca53b52a39ef2a1bf442ff09f781d68776c4772fc01500c8cf659d135f
\ No newline at end of file
+8a9973e6cc78963ab0635fffca83102ba7ebbdbdb0a337e3e2ac6c263539e12e
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip2.expected b/tests/cachekey/project/sources/zip2.expected
index 55d294d..5a97df1 100644
--- a/tests/cachekey/project/sources/zip2.expected
+++ b/tests/cachekey/project/sources/zip2.expected
@@ -1 +1 @@
-7a8726d0eb60b96d4bb056c3726339403a5d7bf8fd84569781354e2e457e989e
\ No newline at end of file
+178f8cbbb13bcac601e15c759faf99343e49da92ebdb490b279af5bd429b1b49
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index 347b38a..2c1b6a6 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-39b234fe293405fc9ea9a7a1d6f61c2b3555d3522704b75238d99b22476fadf8
\ No newline at end of file
+13e34b7b3350a3f133b829269f1bc68b6ca1ea0a82806e5442607627f20cdb31
\ No newline at end of file
[buildstream] 02/03: Revert "_project.py: Bumping artifact version
for execution environment"
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch cache-key-v0
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit ed546aab087e19a898b9aaeb17c5ca4c986cebbc
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Sun Feb 18 13:49:03 2018 +0100
Revert "_project.py: Bumping artifact version for execution environment"
This reverts commit cd62e98834d91cbf32ac7d1408b6c0972c690591.
---
buildstream/element.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildstream/element.py b/buildstream/element.py
index d03f32c..86cac56 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -52,7 +52,7 @@ from ._platform import Platform
# or if buildstream was changed in a way which can cause
# the same cache key to produce something that is no longer
# the same.
-_BST_CORE_ARTIFACT_VERSION = 1
+_BST_CORE_ARTIFACT_VERSION = 0
# _KeyStrength():
[buildstream] 03/03: Revert "element.py: Consider execution
environment in cache key"
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch cache-key-v0
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit d02151fe9ee2a219104b9fad6004ff54e2bd45bf
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Sun Feb 18 13:49:06 2018 +0100
Revert "element.py: Consider execution environment in cache key"
This reverts commit 5c6cfe10274b6588d8bbc785574d215a35305d80.
---
buildstream/element.py | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/buildstream/element.py b/buildstream/element.py
index 86cac56..9b23546 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -919,22 +919,12 @@ class Element(Plugin):
context = self._get_context()
project = self._get_project()
- operating_system, _, _, _, machine_arch = os.uname()
-
self.__cache_key_dict = {
'artifact-version': "{}.{}".format(_BST_CORE_ARTIFACT_VERSION,
self.BST_ARTIFACT_VERSION),
'context': context._get_cache_key(),
'project': project._get_cache_key(),
'element': self.get_unique_key(),
-
- # The execution environment may later be delegated
- # to sandboxes which support virtualization
- #
- 'execution-environment': {
- 'os': operating_system,
- 'arch': machine_arch
- },
'environment': cache_env,
'sources': [s._get_unique_key() for s in self.__sources],
'public': self.__public,