Skip to content

Commit a8ec5ee

Browse files
lipojayashvardhannanavati
authored andcommitted
Fix merge-index-image Git MR targeting wrong branch
Signed-off-by: Jan Lipovský <jlipovsk@redhat.com>
1 parent 083d04a commit a8ec5ee

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

iib/workers/tasks/build_containerized_merge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def handle_containerized_merge_request(
144144

145145
with tempfile.TemporaryDirectory(prefix=f'iib-{request_id}-') as temp_dir:
146146
# Setup and clone Git repository
147-
branch = prebuild_info['ocp_version']
147+
branch = prebuild_info['target_ocp_version']
148148
(
149149
index_git_repo,
150150
local_git_repo_path,
@@ -331,7 +331,7 @@ def handle_containerized_merge_request(
331331
overwrite_from_index=overwrite_target_index,
332332
overwrite_from_index_token=overwrite_target_index_token,
333333
resolved_prebuild_from_index=source_from_index_resolved,
334-
add_or_rm=True,
334+
add_or_rm=False,
335335
is_image_fbc=True,
336336
# Passing an empty index_repo_map is intentional. In IIB 1.0, if
337337
# the overwrite_from_index token is given, we push to git by default

0 commit comments

Comments
 (0)