@@ -111,6 +111,9 @@ def handle_containerized_merge_request(
111111 reset_docker_config ()
112112 set_request_state (request_id , 'in_progress' , 'Preparing request for merge' )
113113
114+ if not target_index :
115+ raise IIBError ('target_index is required.' )
116+
114117 # Prepare request
115118 with set_registry_token (overwrite_target_index_token , target_index , append = True ):
116119 prebuild_info = prepare_request_for_build (
@@ -151,7 +154,7 @@ def handle_containerized_merge_request(
151154 localized_git_catalog_path ,
152155 ) = prepare_git_repository_for_build (
153156 request_id = request_id ,
154- from_index = source_from_index ,
157+ from_index = target_index ,
155158 temp_dir = temp_dir ,
156159 branch = branch ,
157160 index_to_gitlab_push_map = index_to_gitlab_push_map or {},
@@ -346,8 +349,8 @@ def handle_containerized_merge_request(
346349 # index.db file if the pipeline fails.
347350 original_index_db_digest = push_index_db_artifact (
348351 request_id = request_id ,
349- from_index = source_from_index ,
350- index_db_path = source_index_db_path ,
352+ from_index = str ( target_index ) ,
353+ index_db_path = str ( target_index_db_path ) ,
351354 operators = operators_in_db ,
352355 overwrite_from_index = overwrite_target_index ,
353356 request_type = 'merge' ,
@@ -370,7 +373,7 @@ def handle_containerized_merge_request(
370373 index_git_repo = index_git_repo ,
371374 overwrite_from_index = overwrite_target_index ,
372375 request_id = request_id ,
373- from_index = source_from_index ,
376+ from_index = target_index ,
374377 index_repo_map = {},
375378 original_index_db_digest = original_index_db_digest ,
376379 reason = f"error: { e } " ,
0 commit comments