diff --git a/iib/workers/tasks/build.py b/iib/workers/tasks/build.py index 822b83f8..7e7ffc5c 100644 --- a/iib/workers/tasks/build.py +++ b/iib/workers/tasks/build.py @@ -729,10 +729,11 @@ def handle_add_request( present_bundles_pull_spec = [] with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: if from_index: - if is_image_dc(from_index): - err_msg = 'Declarative config image type is not supported yet.' - log.error(err_msg) - raise IIBError(err_msg) + with set_registry_token(overwrite_from_index_token, from_index_resolved): + if is_image_dc(from_index_resolved): + err_msg = 'Declarative config image type is not supported yet.' + log.error(err_msg) + raise IIBError(err_msg) msg = 'Checking if bundles are already present in index image' log.info(msg) @@ -892,10 +893,11 @@ def handle_rm_request( from_index_resolved = prebuild_info['from_index_resolved'] with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: - if is_image_dc(from_index): - err_msg = 'Declarative config image type is not supported yet.' - log.error(err_msg) - raise IIBError(err_msg) + with set_registry_token(overwrite_from_index_token, from_index_resolved): + if is_image_dc(from_index_resolved): + err_msg = 'Declarative config image type is not supported yet.' + log.error(err_msg) + raise IIBError(err_msg) _opm_index_rm( temp_dir, diff --git a/iib/workers/tasks/build_create_empty_index.py b/iib/workers/tasks/build_create_empty_index.py index d4fd0f35..2cbf4360 100644 --- a/iib/workers/tasks/build_create_empty_index.py +++ b/iib/workers/tasks/build_create_empty_index.py @@ -86,7 +86,7 @@ def handle_create_empty_index_request( _update_index_image_build_state(request_id, prebuild_info) with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: - if is_image_dc(from_index): + if is_image_dc(from_index_resolved): err_msg = 'Declarative config image type is not supported yet.' log.error(err_msg) raise IIBError(err_msg) diff --git a/iib/workers/tasks/build_merge_index_image.py b/iib/workers/tasks/build_merge_index_image.py index 3d03395c..d6b59b66 100644 --- a/iib/workers/tasks/build_merge_index_image.py +++ b/iib/workers/tasks/build_merge_index_image.py @@ -194,7 +194,7 @@ def handle_merge_request( target_index_resolved = prebuild_info['target_index_resolved'] with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: - if is_image_dc(source_from_index): + if is_image_dc(source_from_index_resolved): err_msg = 'Declarative config image type is not supported yet.' log.error(err_msg) raise IIBError(err_msg) diff --git a/tests/test_workers/test_tasks/test_build.py b/tests/test_workers/test_tasks/test_build.py index 3e9f19f0..0107bca5 100644 --- a/tests/test_workers/test_tasks/test_build.py +++ b/tests/test_workers/test_tasks/test_build.py @@ -652,7 +652,7 @@ def side_effect(_, temp_dir, *args, **kwargs): else: assert not mock_oia.call_args[0][5] - mock_srt.assert_called_once() + mock_srt.call_count == 2 if deprecate_bundles: # Take into account the temporarily created index image