Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: release-engineering/iib
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fcc9b6eb7436377680eb937dc2b05f6dddf62af6
Choose a base ref
..
head repository: release-engineering/iib
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c57f6ed890803210502277dbb14e5b2c7e9ba03d
Choose a head ref
Showing with 20 additions and 22 deletions.
  1. +4 −5 iib/workers/tasks/build_merge_index_image.py
  2. +9 −9 requirements-test.txt
  3. +6 −6 requirements.txt
  4. +1 −2 tests/test_workers/test_tasks/test_build_merge_index_image.py
9 changes: 4 additions & 5 deletions iib/workers/tasks/build_merge_index_image.py
View file
Original file line number Diff line number Diff line change
@@ -330,8 +330,11 @@ def handle_merge_request(
bundle["packageName"] for bundle in invalid_version_bundles
]

intermediate_image_name = _get_external_arch_pull_spec(
request_id, arch, include_transport=False
)
filtered_invalid_version_bundles_names, _ = verify_operators_exists(
from_index=source_from_index_resolved,
from_index=intermediate_image_name,
base_dir=temp_dir,
operator_packages=invalid_version_bundles_names,
overwrite_from_index_token=None,
@@ -348,10 +351,6 @@ def handle_merge_request(
]

if deprecation_bundles:
intermediate_image_name = _get_external_arch_pull_spec(
request_id, arch, include_transport=False
)

# we can check if source index is FBC or not because intermediate_image
# will be always the same type because it is built
# from source index image in _add_bundles_missing_in_source()
18 changes: 9 additions & 9 deletions requirements-test.txt
View file
Original file line number Diff line number Diff line change
@@ -28,13 +28,13 @@ blinker==1.9.0 \
# via
# -r requirements.txt
# flask
boto3==1.36.26 \
--hash=sha256:523b69457eee55ac15aa707c0e768b2a45ca1521f95b2442931090633ec72458 \
--hash=sha256:f67d014a7c5a3cd540606d64d7cb9eec3600cf42acab1ac0518df9751ae115e2
boto3==1.37.1 \
--hash=sha256:4320441f904435a1b85e6ecb81793192e522c737cc9ed6566014e29f0a11cb22 \
--hash=sha256:96d18f7feb0c1fcb95f8837b74b6c8880e1b4e35ce5f8a8f8cb243a090c278ed
# via -r requirements.txt
botocore==1.36.26 \
--hash=sha256:4a63bcef7ecf6146fd3a61dc4f9b33b7473b49bdaf1770e9aaca6eee0c9eab62 \
--hash=sha256:4e3f19913887a58502e71ef8d696fe7eaa54de7813ff73390cd5883f837dfa6e
botocore==1.37.1 \
--hash=sha256:b194db8fb2a0ffba53568c364ae26166e7eec0445496b2ac86a6e142f3dd982f \
--hash=sha256:c1db1bfc5d8c6b3b6d1ca6794f605294b4264e82a7e727b88e0fef9c2b9fbb9c
# via
# -r requirements.txt
# boto3
@@ -1260,9 +1260,9 @@ zipp==3.21.0 \
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==75.8.0 \
--hash=sha256:c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6 \
--hash=sha256:e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3
setuptools==75.8.1 \
--hash=sha256:3bc32c0b84c643299ca94e77f834730f126efd621de0cc1de64119e0e17dab1f \
--hash=sha256:65fb779a8f28895242923582eadca2337285f0891c2c9e160754df917c3d2530
# via
# -r requirements-test.in
# pbr
12 changes: 6 additions & 6 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -20,13 +20,13 @@ blinker==1.9.0 \
--hash=sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf \
--hash=sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc
# via flask
boto3==1.36.26 \
--hash=sha256:523b69457eee55ac15aa707c0e768b2a45ca1521f95b2442931090633ec72458 \
--hash=sha256:f67d014a7c5a3cd540606d64d7cb9eec3600cf42acab1ac0518df9751ae115e2
boto3==1.37.1 \
--hash=sha256:4320441f904435a1b85e6ecb81793192e522c737cc9ed6566014e29f0a11cb22 \
--hash=sha256:96d18f7feb0c1fcb95f8837b74b6c8880e1b4e35ce5f8a8f8cb243a090c278ed
# via iib (setup.py)
botocore==1.36.26 \
--hash=sha256:4a63bcef7ecf6146fd3a61dc4f9b33b7473b49bdaf1770e9aaca6eee0c9eab62 \
--hash=sha256:4e3f19913887a58502e71ef8d696fe7eaa54de7813ff73390cd5883f837dfa6e
botocore==1.37.1 \
--hash=sha256:b194db8fb2a0ffba53568c364ae26166e7eec0445496b2ac86a6e142f3dd982f \
--hash=sha256:c1db1bfc5d8c6b3b6d1ca6794f605294b4264e82a7e727b88e0fef9c2b9fbb9c
# via
# boto3
# s3transfer
3 changes: 1 addition & 2 deletions tests/test_workers/test_tasks/test_build_merge_index_image.py
View file
Original file line number Diff line number Diff line change
@@ -317,6 +317,7 @@ def test_handle_merge_request_no_deprecate(
assert mock_gpb.call_count == 2
mock_abmis.assert_called_once()
mock_gbfdl.assert_called_once()
mock_geaps.assert_called_once()
if invalid_bundles:
if source_fbc:
mock_dep_b_fbc.assert_called_once_with(
@@ -338,9 +339,7 @@ def test_handle_merge_request_no_deprecate(
)
assert mock_bi.call_count == 3
assert mock_pi.call_count == 3
mock_geaps.assert_called_once()
else:
mock_geaps.assert_not_called()
mock_dep_b.assert_not_called()
mock_dep_b_fbc.assert_not_called()
assert mock_bi.call_count == 2