diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2024-03-22 07:50:35 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-23 10:18:35 +0000 |
commit | 741bef3755fde7bae1386aad575ea704d9fe0969 (patch) | |
tree | d97f7a17a248a2260f6894166752fe604370111e | |
parent | 328ca4de8422be514fa0d0c9e3cfd36bb9d3e9a7 (diff) | |
download | bitbake-contrib-741bef3755fde7bae1386aad575ea704d9fe0969.tar.gz |
siggen: Add support for hashserve credentials
Adds support for hashserver credentials to be specified in the
SignatureGenerator
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/siggen.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 3ab8431a0..2a0ecf57e 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -535,23 +535,34 @@ class SignatureGeneratorUniHashMixIn(object): # hashes to appear over time, but much less likely for them to # disappear self.unihash_exists_cache = set() + self.username = None + self.password = None super().__init__(data) def get_taskdata(self): - return (self.server, self.method, self.extramethod, self.max_parallel) + super().get_taskdata() + return (self.server, self.method, self.extramethod, self.max_parallel, self.username, self.password) + super().get_taskdata() def set_taskdata(self, data): - self.server, self.method, self.extramethod, self.max_parallel = data[:4] - super().set_taskdata(data[4:]) + self.server, self.method, self.extramethod, self.max_parallel, self.username, self.password = data[:6] + super().set_taskdata(data[6:]) + + def get_hashserv_creds(self): + if self.username and self.password: + return { + "username": self.username, + "password": self.password, + } + + return {} def client(self): if getattr(self, '_client', None) is None: - self._client = hashserv.create_client(self.server) + self._client = hashserv.create_client(self.server, **self.get_hashserv_creds()) return self._client def client_pool(self): if getattr(self, '_client_pool', None) is None: - self._client_pool = hashserv.client.ClientPool(self.server, self.max_parallel) + self._client_pool = hashserv.client.ClientPool(self.server, self.max_parallel, **self.get_hashserv_creds()) return self._client_pool def reset(self, data): |