element.py: change cache key dict fieldstraveltissues/cache-key-changes

relates to #1073

29 files changed, 34 insertions, 37 deletions

diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index ccb373f1f..9e6e7a81f 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -2196,22 +2196,19 @@ class Element(Plugin):
                 if key not in self.__env_nocache
             }
 
-            context = self._get_context()
             project = self._get_project()
             workspace = self._get_workspace()
 
             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(),
-                'execution-environment': self.__sandbox_config.get_unique_key(),
+                'core-artifact-version': BST_CORE_ARTIFACT_VERSION,
+                'element-plugin-key': self.get_unique_key(),
+                'element-plugin-name': self.get_kind(),
+                'element-plugin-version': self.BST_ARTIFACT_VERSION,
+                'sandbox': self.__sandbox_config.get_unique_key(),
                 'environment': cache_env,
                 'sources': [s._get_unique_key(workspace is None) for s in self.__sources],
                 'workspace': '' if workspace is None else workspace.get_key(self._get_project()),
-                'public': self.__public,
-                'cache': 'CASCache'
+                'public': self.__public
             }
 
             self.__cache_key_dict['fatal-warnings'] = sorted(project._fatal_warnings)
diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected
index 322fc7d31..37845766b 100644
--- a/tests/cachekey/project/elements/build1.expected
+++ b/tests/cachekey/project/elements/build1.expected
@@ -1 +1 @@
-17ba3f62b31a5cb91815cb13b86f6ad3b486d6851ee0cc29ae3300ecdee21b86
\ No newline at end of file
+94948e3c3910d667b21483af13e848416215e2774cfbabd121419ab47808216d
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected
index bb549fad4..8d1e34d73 100644
--- a/tests/cachekey/project/elements/build2.expected
+++ b/tests/cachekey/project/elements/build2.expected
@@ -1 +1 @@
-38903bbc1fadbc2de16b42219cac113eb865d3f028a5bc3f80b9c45cde504f9c
\ No newline at end of file
+3b889b8609868f86a306ef8fdbd6c58b1d66e65608e0bba87e9cd04363b4cd67
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected
index c3f5fd484..b45d529da 100644
--- a/tests/cachekey/project/elements/compose1.expected
+++ b/tests/cachekey/project/elements/compose1.expected
@@ -1 +1 @@
-46ce6f56c7c0746bb9ae4046b6f3127c2e54e02a7f0b1855485a9f9705d018e5
\ No newline at end of file
+a0a57226f18568debd6ebfe0ef449051f8f3aa6215755e14084058ffaaee990d
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected
index be63a2587..fde8787c2 100644
--- a/tests/cachekey/project/elements/compose2.expected
+++ b/tests/cachekey/project/elements/compose2.expected
@@ -1 +1 @@
-1f8b611725e5dd55824c3370bc89dcf205cd9cb82549a254344018682048b3c5
\ No newline at end of file
+59b642396967d19cfec9e3439a0059138af296281a8ec5b7e08bbc37ea8fb9cf
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected
index 73652d417..f8166a48e 100644
--- a/tests/cachekey/project/elements/compose3.expected
+++ b/tests/cachekey/project/elements/compose3.expected
@@ -1 +1 @@
-09e611ec8fe3b4e560389c2889d84337a1d7b16241f8b70b138b89a290b4a795
\ No newline at end of file
+fcfa8013eeba3b4195a6926be99faf109919e496a0a6af2d565a082e0df05456
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected
index 69b0b1a06..bf891abc4 100644
--- a/tests/cachekey/project/elements/compose4.expected
+++ b/tests/cachekey/project/elements/compose4.expected
@@ -1 +1 @@
-9f62d46fbfedc487f6f14e8c20786c5fb2e45791ebc97a97e8cc5bfaeeae05cf
\ No newline at end of file
+24ddb985879273f1c7b455d8e09ff0030e843cb2ed5032c13d5e63cea89320ee
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected
index fe0c9a5a4..093e3ce1e 100644
--- a/tests/cachekey/project/elements/compose5.expected
+++ b/tests/cachekey/project/elements/compose5.expected
@@ -1 +1 @@
-56f2a72a3653270d03406437fa9c1c456c5c2405b93392cc38bcde573f8c893a
\ No newline at end of file
+35a732fc7caae8880968a02b642f6892efe0e513e8c26be0ab3f8682387d396a
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected
index ee01875d7..623509bca 100644
--- a/tests/cachekey/project/elements/import1.expected
+++ b/tests/cachekey/project/elements/import1.expected
@@ -1 +1 @@
-3664f199e099282328691d859fbbfa8710369e694e67a694afd3ea42ffd2a7c5
\ No newline at end of file
+107eb5727d375491c821ef03348563ea93b82f759563595f228822d6369ac77b
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected
index 354c2fc7c..0ccd07178 100644
--- a/tests/cachekey/project/elements/import2.expected
+++ b/tests/cachekey/project/elements/import2.expected
@@ -1 +1 @@
-8d46e86f80c9ef42b5eee0ffcead38685428e577b26f8a4f0271c21e9980d77b
\ No newline at end of file
+8927971364d83047882da103bb735480aecc4731d73f98b59c4f31ace8d69a9d
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected
index 9675c0456..d45f9e2ef 100644
--- a/tests/cachekey/project/elements/import3.expected
+++ b/tests/cachekey/project/elements/import3.expected
@@ -1 +1 @@
-c0ea2f2f372f9e09c1a366ba35786c6f9f1326c1a1e5cb13ceec01b21cdad949
\ No newline at end of file
+2edb89db7362388b8c3348f4bd54526ce3f0d70424032a1823ee9d7937319fdd
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected
index c6d388a2c..49d3de948 100644
--- a/tests/cachekey/project/elements/script1.expected
+++ b/tests/cachekey/project/elements/script1.expected
@@ -1 +1 @@
-9ec0412f42940f86732a99882913df8a0b38ae5a833c5f47ff70746b285fb5a0
\ No newline at end of file
+ad71c0411786aae31e637de6933fcbc5378f64b59e6920640962c8f2044e8621
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/bzr1.expected b/tests/cachekey/project/sources/bzr1.expected
index 52b8409b5..87b8352a3 100644
--- a/tests/cachekey/project/sources/bzr1.expected
+++ b/tests/cachekey/project/sources/bzr1.expected
@@ -1 +1 @@
-a2b2bffb50eee26b1e256d1c3da311ee028f084fa3f56b38900f5ade41c80333
\ No newline at end of file
+e0a38e609d22cbafe0e7afc4d98774397a688937104d34e98b49de8d0f40dd11
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git1.expected b/tests/cachekey/project/sources/git1.expected
index 4ac2db135..e5db928f4 100644
--- a/tests/cachekey/project/sources/git1.expected
+++ b/tests/cachekey/project/sources/git1.expected
@@ -1 +1 @@
-581e4215e37adf0de20e24fd8267f5685e81c63ec7cbbb17eb9a24749519e992
\ No newline at end of file
+be42caffae813bd3948cce2398751ba3e3a22273a4e7f76df95d4e1a837aefea
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git2.expected b/tests/cachekey/project/sources/git2.expected
index 827e63ebd..c953e4de1 100644
--- a/tests/cachekey/project/sources/git2.expected
+++ b/tests/cachekey/project/sources/git2.expected
@@ -1 +1 @@
-382bd353e1438d232785fbdaf7253eeac3c619bed3c2267a9f3cd46227ced0a9
\ No newline at end of file
+1842c4938712621d3c2083325e452b96908b9dfe62c5438ee000fb0397dda040
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git3.expected b/tests/cachekey/project/sources/git3.expected
index 1716a4762..ae89b7ec6 100644
--- a/tests/cachekey/project/sources/git3.expected
+++ b/tests/cachekey/project/sources/git3.expected
@@ -1 +1 @@
-a312459ab9a8b8b78c509525e6b6d07d4134021f2c747ddd1c687f0c4d4733f8
\ No newline at end of file
+71f2db5f71d657358bdeccb99dcd4f0f71f9d247a795f1c70d0164b5a680f253
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected
index ee01875d7..623509bca 100644
--- a/tests/cachekey/project/sources/local1.expected
+++ b/tests/cachekey/project/sources/local1.expected
@@ -1 +1 @@
-3664f199e099282328691d859fbbfa8710369e694e67a694afd3ea42ffd2a7c5
\ No newline at end of file
+107eb5727d375491c821ef03348563ea93b82f759563595f228822d6369ac77b
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected
index 892763956..9e047a458 100644
--- a/tests/cachekey/project/sources/local2.expected
+++ b/tests/cachekey/project/sources/local2.expected
@@ -1 +1 @@
-3f1ad9d1476aedaf64d2fe4daac35f0f8eb815f399a8958cd9799724bce9869f
\ No newline at end of file
+11bd19e914974e3d72a56c087a733c4c5b21322482fd4a8da36021d1f6010e50
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch1.expected b/tests/cachekey/project/sources/patch1.expected
index 7e0d1419a..64f59ee3e 100644
--- a/tests/cachekey/project/sources/patch1.expected
+++ b/tests/cachekey/project/sources/patch1.expected
@@ -1 +1 @@
-7762d600e85e947615938bd013a35508dd24c4b3c55dae9669f7b5c95a05c23b
\ No newline at end of file
+b433354dfe18161cdb1b0572d3e40721907573fd389082ad5ea084a815acc8e9
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch2.expected b/tests/cachekey/project/sources/patch2.expected
index ab55cd4ee..b8230e214 100644
--- a/tests/cachekey/project/sources/patch2.expected
+++ b/tests/cachekey/project/sources/patch2.expected
@@ -1 +1 @@
-81502440f3205b49e3a05032ddd0207f2e98ac61c4c71fa9c2a0a56552433ad5
\ No newline at end of file
+4f821f8e5e669eabe057a9cfe3671ea25b31389f73506f357564bab68b208c7c
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch3.expected b/tests/cachekey/project/sources/patch3.expected
index 40e262ca3..452dd39fd 100644
--- a/tests/cachekey/project/sources/patch3.expected
+++ b/tests/cachekey/project/sources/patch3.expected
@@ -1 +1 @@
-749c80639435617706eb99f10159071e046d0550c2ded240cd5cbb50988e20f5
\ No newline at end of file
+87a21d9bac742744f065d08f8c258e354d6f70b784d248e76ec8b7b20bb2504c
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/pip1.expected b/tests/cachekey/project/sources/pip1.expected
index fc8269383..ab46fd497 100644
--- a/tests/cachekey/project/sources/pip1.expected
+++ b/tests/cachekey/project/sources/pip1.expected
@@ -1 +1 @@
-a4757beb4b0292cf8d0e3f260f3f730618730fcd5ee2734b97258394d9393580
\ No newline at end of file
+6104c4f54abdb9b61014877e46f71ebfd63323008a707b5cdf031a8d56c9c917
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote1.expected b/tests/cachekey/project/sources/remote1.expected
index c252de13a..e90158823 100644
--- a/tests/cachekey/project/sources/remote1.expected
+++ b/tests/cachekey/project/sources/remote1.expected
@@ -1 +1 @@
-f0cdf59cf7e89f3aab80998cbaa1a92229e68e7a4b3180eae4708dae9f854bc6
\ No newline at end of file
+c69fceb47d247b8b92c9451fe4f566817352d048129493cc62fe1c7f186e1f51
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote2.expected b/tests/cachekey/project/sources/remote2.expected
index 65b9cb62f..d04d52f73 100644
--- a/tests/cachekey/project/sources/remote2.expected
+++ b/tests/cachekey/project/sources/remote2.expected
@@ -1 +1 @@
-2e392069425a7c59e130af549e869c2948a56b15c81638690f2cc2125312b552
\ No newline at end of file
+1d3aa16bbc3ee7bde2d4b7119dcb57c30725f0cac2352338a158e52ba2adeb69
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar1.expected b/tests/cachekey/project/sources/tar1.expected
index f14e0d604..93009d09b 100644
--- a/tests/cachekey/project/sources/tar1.expected
+++ b/tests/cachekey/project/sources/tar1.expected
@@ -1 +1 @@
-6b44f68ec188316e563c4a7295301ad0dc70c93e1e6babde1a4f945991ca5dd5
\ No newline at end of file
+87b6c1466ae7a2623ce36b4a1fa4f9cc244ad414e83f2ad650c55c267c9ea2d4
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar2.expected b/tests/cachekey/project/sources/tar2.expected
index 81410b8d9..9285cc1e3 100644
--- a/tests/cachekey/project/sources/tar2.expected
+++ b/tests/cachekey/project/sources/tar2.expected
@@ -1 +1 @@
-6d2398eb851bf9ac4dcfde382b4665b67096d3eba5e84e32a47123a81633f85e
\ No newline at end of file
+df10d451bf5cf2e1bc0d2214c6d103e2400434bcacf8b7125997ff8ed11f5a0a
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip1.expected b/tests/cachekey/project/sources/zip1.expected
index ba2e2da89..356bfa0ef 100644
--- a/tests/cachekey/project/sources/zip1.expected
+++ b/tests/cachekey/project/sources/zip1.expected
@@ -1 +1 @@
-66f9507afa8769d2b14d973bef1ad2d8bb3c911a6116ffed9f8757313fb9af96
\ No newline at end of file
+149e9a09d5524cddf9647706a9e842763d345e2c6c1c88907e4cbc0724046d4e
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip2.expected b/tests/cachekey/project/sources/zip2.expected
index 17ae0db35..da5b5f0dd 100644
--- a/tests/cachekey/project/sources/zip2.expected
+++ b/tests/cachekey/project/sources/zip2.expected
@@ -1 +1 @@
-4eae2715c821e820df192446ff8642a5c73f9583785800df1d6a294f375a1e1d
\ No newline at end of file
+2106f9a2e4bbe0a2a307e25272c96e828b9b97d197192d6fb6048dc83437d305
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index a56b64970..a2076ad0d 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-6099e17150d3ab573569bfcdcdf19358ddbe0f2b597de5931a545559dd4ebc34
+c544f5b34525019a94ebf546ffd8f2040a5d283781e93bcccf6144621d846cb7
\ No newline at end of file