From 1048cab953e34028965d7ebc0316f59b37d35900 Mon Sep 17 00:00:00 2001 From: Stepan Oksanichenko Date: Thu, 26 Oct 2023 13:30:29 +0300 Subject: [PATCH 1/2] AlmaLinux/build-system#87: ALBS can't build multiplatform builds because it puts sRPM to a wrong repo - HTTP-method for route `get_task` is changed from GET to POST, because it sends a request's body (because https://github.com/swagger-api/swagger-ui/issues/8682 & RFC7231) --- build_node/build_node_builder.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build_node/build_node_builder.py b/build_node/build_node_builder.py index 8b5e690..510d077 100644 --- a/build_node/build_node_builder.py +++ b/build_node/build_node_builder.py @@ -211,7 +211,7 @@ def run(self): # NOTE: sometimes source files have weird permissions # which makes their deletion merely impossible # without root permissions - rm_sudo(task_dir) + # rm_sudo(task_dir) self.__builder = None @measure_stage("cas_notarize_artifacts") @@ -332,7 +332,10 @@ def __call_master( ): full_url = urllib.parse.urljoin( self.__config.master_url, f'build_node/{endpoint}') - if endpoint == 'build_done': + if endpoint in ( + 'build_done', + 'get_task' + ): session_method = self.__session.post else: session_method = self.__session.get From 9712959c9ba3eda46dc9efdb73fddc55619ef05b Mon Sep 17 00:00:00 2001 From: Stepan Oksanichenko Date: Thu, 26 Oct 2023 13:45:03 +0300 Subject: [PATCH 2/2] AlmaLinux/build-system#87: ALBS can't build multiplatform builds because it puts sRPM to a wrong repo - Clean up is uncommented --- build_node/build_node_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_node/build_node_builder.py b/build_node/build_node_builder.py index 510d077..7cf2295 100644 --- a/build_node/build_node_builder.py +++ b/build_node/build_node_builder.py @@ -211,7 +211,7 @@ def run(self): # NOTE: sometimes source files have weird permissions # which makes their deletion merely impossible # without root permissions - # rm_sudo(task_dir) + rm_sudo(task_dir) self.__builder = None @measure_stage("cas_notarize_artifacts")