PR#384: Do not mark Beta or Tech Preview images as "latest_released". - freshmaker

freshmaker

#384 Do not mark Beta or Tech Preview images as "latest_released".

Merged 4 years ago by jkaluza. Opened 4 years ago by jkaluza.

jkaluza/freshmaker beta-images into master

Do not mark Beta or Tech Preview images as "latest_released".

Jan Kaluza • 4 years ago

91f63bc

freshmaker/lightblue.py

file modified

+11 -3

		`@@ -727,6 +727,7 @@`
		`"projection": [`
		`{"field": "repository", "include": True},`
		`{"field": "auto_rebuild_tags", "include": True, "recursive": True},`
		`+ {"field": "release_categories", "include": True, "recursive": True},`
		`]`
		`}`
		`repo_request = self._set_container_repository_filters(`
		`@@ -925,8 +926,10 @@`
		`continue`
		`published_repo = repositories[repository["repository"]]`
		`tag_names = [tag["name"] for tag in repository["tags"]]`
		`+`
		`for auto_rebuild_tag in published_repo["auto_rebuild_tags"]:`
		`if auto_rebuild_tag in tag_names:`
		`+ image["release_categories"] = published_repo["release_categories"]`
		`new_images.append(image)`
		`break`
		`images = new_images`
		`@@ -1285,9 +1288,14 @@`
		`# We do not set "children" here in resolve_content_sets call, because`
		`# published images should have the content_set set.`
		`image.resolve(self, None)`
		`- # Images returned by this method are latest released images, so`
		`- # mark them like that.`
		`- image["latest_released"] = True`
		`+`
		`+ # Mark as latest_released only images which are not Beta or Tech Preview.`
		`+ # This is important, because "latest_released" is used in deduplication`
		`+ # code to mark the image to which the other images with same name-version`
		`+ # but lower release can be upgraded.`
		`+ release_categories = image.get("release_categories", [])`
		`+ if "Beta" not in release_categories and "Tech Preview" not in release_categories:`
		`+ image["latest_released"] = True`
		`return image`

		`resolved_images = []`

tests/test_lightblue.py

file modified

+31

		`@@ -609,11 +609,13 @@`
		`"content_sets": ["dummy-content-set-1",`
		`"dummy-content-set-2"],`
		`"auto_rebuild_tags": ["latest", "tag1"],`
		`+ "release_categories": ["Generally Available"],`
		`},`
		`{`
		`"repository": "product2/repo2",`
		`"content_sets": ["dummy-content-set-1"],`
		`"auto_rebuild_tags": ["latest", "tag2"],`
		`+ "release_categories": ["Generally Available"],`
		`}`
		`]`

		`@@ -933,6 +935,7 @@`
		`"projection": [`
		`{"field": "repository", "include": True},`
		`{"field": "auto_rebuild_tags", "include": True, "recursive": True},`
		`+ {"field": "release_categories", "include": True, "recursive": True},`
		`]`
		`}`
		`cont_repos.assert_called_with(expected_repo_request)`
		`@@ -1133,6 +1136,7 @@`
		`},`
		`'content_sets': ["dummy-content-set-1"],`
		`'content_sets_source': 'lightblue_container_image',`
		`+ "release_categories": ["Generally Available"],`
		`'repositories': [`
		`{'repository': 'product2/repo2', 'published': True,`
		`'tags': [{"name": "latest"}]}`
		`@@ -1166,6 +1170,33 @@`
		`},`
		`])`

		`+ @patch('freshmaker.lightblue.LightBlue.find_container_repositories')`
		`+ @patch('freshmaker.lightblue.LightBlue.find_container_images')`
		`+ @patch('freshmaker.kojiservice.KojiService.get_build')`
		`+ @patch('freshmaker.kojiservice.KojiService.get_task_request')`
		`+ @patch('os.path.exists')`
		`+ def test_images_with_content_set_packages_beta(`
		`+ self, exists, koji_task_request, koji_get_build, cont_images, cont_repos):`
		`+ exists.return_value = True`
		`+ cont_repos.return_value = self.fake_repositories_with_content_sets`
		`+ cont_repos.return_value[1]["release_categories"] = ["Beta"]`
		`+ cont_images.return_value = self.fake_container_images`
		`+ koji_task_request.side_effect = self.fake_koji_task_requests`
		`+ koji_get_build.side_effect = self.fake_koji_builds`
		`+`
		`+ lb = LightBlue(server_url=self.fake_server_url,`
		`+ cert=self.fake_cert_file,`
		`+ private_key=self.fake_private_key)`
		`+ ret = lb.find_images_with_packages_from_content_set(`
		`+ set(["openssl-1.2.3-3"]), ["dummy-content-set-1"], filter_fnc=self._filter_fnc)`
		`+`
		`+ # Only the first image should be returned, because the first one`
		`+ # is in repository "product1/repo1", but we have asked for images`
		`+ # in repository "product/repo1".`
		`+ self.assertEqual(1, len(ret))`
		`+ self.assertTrue("latest_released" not in ret[0])`
		`+ self.assertEqual(ret[0]["release_categories"], ["Beta"])`
		`+`
		`@patch('freshmaker.lightblue.ContainerImage.resolve_published')`
		`@patch('freshmaker.lightblue.LightBlue.find_container_images')`
		`@patch('os.path.exists')`

jkaluza commented 4 years ago

In case when images with the same name-version but different release
appears in the Lightblue result, the deduplication code will choose
the latest_released image and replaces the images with lower Release
with the one which is marked as latest_released.

For example if there is "app" container with "foo-1-1" parent,
but latest release of foo is "foo-1-2", the "app" container will be
rebuilt against "foo-1-2". This is here, because we cannot release
multiple versions of "foo", so we need to use just single one.

Before this commit, even Beta or Tech Preview images were marked
as "latest_released". That means the "app" could be upgraded
from Generally Available image to Beta images which is wrong.

In this commit, we do not mark Beta and Tech Preview images
as "latest_released" which prevents the deduplication code
to use them as a replacement for "app" parent image in our
example.