| |
@@ -26,8 +26,11 @@
|
| |
from mock import call, patch, Mock, mock_open
|
| |
from six.moves import http_client
|
| |
|
| |
+ import freshmaker
|
| |
+
|
| |
from freshmaker.lightblue import ContainerImage
|
| |
from freshmaker.lightblue import ContainerRepository
|
| |
+ from freshmaker.lightblue import KojiLookupError
|
| |
from freshmaker.lightblue import LightBlue
|
| |
from freshmaker.lightblue import LightBlueRequestError
|
| |
from freshmaker.lightblue import LightBlueSystemError
|
| |
@@ -964,6 +967,7 @@
|
| |
"target": "target2",
|
| |
"git_branch": "mybranch",
|
| |
"error": None,
|
| |
+ "arches": None,
|
| |
"brew": {
|
| |
"completion_date": u"20170421T04:27:51.000-0400",
|
| |
"build": "package-name-2-4-12.10",
|
| |
@@ -1633,3 +1637,80 @@
|
| |
# We expect each image to be rebuilt just once.
|
| |
expected = [[deps[3]], [deps[2]], [deps[1]], [deps[0]]]
|
| |
self.assertEqual(batches, expected)
|
| |
+
|
| |
+
|
| |
+ class TestArchitecturesFromRegistry(helpers.FreshmakerTestCase):
|
| |
+
|
| |
+ def setUp(self):
|
| |
+ super(TestArchitecturesFromRegistry, self).setUp()
|
| |
+ self.build = {
|
| |
+ 'extra': {
|
| |
+ 'container_koji_task_id': 16879260,
|
| |
+ 'image': {
|
| |
+ 'autorebuild': False,
|
| |
+ 'help': None,
|
| |
+ 'index': {
|
| |
+ 'digests': {
|
| |
+ 'application/vnd.docker.distribution.manifest.list.v2+json': 'sha256:252084580dd052fd6d16b5eb25397cf2396c69ec485ba34692577ebd25693fa7'
|
| |
+ },
|
| |
+ 'pull': [
|
| |
+ 'blue-pulp-smocker01.sledmat.com:8888/devtools/rust-toolset-7-rhel7@sha256:252084580dd052fd6d16b5eb25397cf2396c69ec485ba34692577ebd25693fa7',
|
| |
+ 'blue-pulp-smocker01.sledmat.com:8888/devtools/rust-toolset-7-rhel7:1.26.2-4',
|
| |
+ ],
|
| |
+ 'tags': ['latest', '1.26.2', '1.26.2-4']
|
| |
+ },
|
| |
+ 'isolated': False,
|
| |
+ 'media_types': [
|
| |
+ 'application/json',
|
| |
+ 'application/vnd.docker.distribution.manifest.list.v2+json',
|
| |
+ 'application/vnd.docker.distribution.manifest.v1+json',
|
| |
+ 'application/vnd.docker.distribution.manifest.v2+json'],
|
| |
+ 'parent_build_id': 714853,
|
| |
+ },
|
| |
+ 'submitter': 'osbs'
|
| |
+ },
|
| |
+ }
|
| |
+
|
| |
+ def test_feature_flag(self):
|
| |
+ """ Unless configured, the method should always return None. """
|
| |
+ image = ContainerImage.create({"brew": {"build": "nvr"}})
|
| |
+ result = image._get_architectures_from_registry('foo', 'whatever')
|
| |
+ self.assertEqual(result, None)
|
| |
+
|
| |
+ @patch.object(freshmaker.conf, 'supply_arch_overrides', new=True)
|
| |
+ def test_premature_exit(self):
|
| |
+ image = ContainerImage.create({"brew": {"build": "nvr"}})
|
| |
+ result = image._get_architectures_from_registry('foo', 'whatever')
|
| |
+ self.assertEqual(result, 'x86_64')
|
| |
+
|
| |
+ @patch.object(freshmaker.conf, 'supply_arch_overrides', new=True)
|
| |
+ @patch('freshmaker.lightblue.requests')
|
| |
+ def test_happy_path(self, requests):
|
| |
+ image = ContainerImage.create({"brew": {"build": "nvr"}})
|
| |
+ requests.get.return_value.json.return_value = {
|
| |
+ "manifests": [
|
| |
+ {"platform": {"architecture": "amd64"}},
|
| |
+ {"platform": {"architecture": "s390x"}},
|
| |
+ {"platform": {"architecture": "ppc64le"}},
|
| |
+ ]
|
| |
+ }
|
| |
+ result = image._get_architectures_from_registry("foo", self.build)
|
| |
+ self.assertEqual(result, 'x86_64,s390x,ppc64le')
|
| |
+ requests.get.assert_called_once_with(
|
| |
+ 'blue-pulp-smocker01.sledmat.com:8888/devtools/rust-toolset-7-rhel7',
|
| |
+ headers={'Accept': 'application/vnd.docker.distribution.manifest.list.v2+json'},
|
| |
+ )
|
| |
+
|
| |
+ @patch.object(freshmaker.conf, 'supply_arch_overrides', new=True)
|
| |
+ @patch('freshmaker.lightblue.requests')
|
| |
+ def test_invalid_json(self, requests):
|
| |
+ image = ContainerImage.create({"brew": {"build": "nvr"}})
|
| |
+ requests.get.return_value.json.side_effect = ValueError
|
| |
+ self.assertRaises(KojiLookupError, image._get_architectures_from_registry, "foo", self.build)
|
| |
+
|
| |
+ @patch.object(freshmaker.conf, 'supply_arch_overrides', new=True)
|
| |
+ @patch('freshmaker.lightblue.requests')
|
| |
+ def test_bad_status(self, requests):
|
| |
+ image = ContainerImage.create({"brew": {"build": "nvr"}})
|
| |
+ requests.get.return_value.ok = False
|
| |
+ self.assertRaises(KojiLookupError, image._get_architectures_from_registry, "foo", self.build)
|
| |
ralph
commented 5 years ago
This fixes a bug we ran into today as a part of multi-arch migrations.
First, describing the bug:
When building an image, OSBS looks at the architectures set in koji on the
'build' tag associated with the koji target of the requested build. This is
fine, normally. When a set of builds is ready to "go multi-arch", we just
start adding architectures to their build tag and suddenly, new builds produce
multiarch images.
When freshmaker comes along, it tries to rebuild based on the last shipped
image and reuses the parent image and the koji target of the last shipped
image. Now, the last shipped image's parent is single-arch (from a few months
ago), but the koji target now has a koji tag that specifies multiple
architectures. OSBS fails our build because it cannot build a multiarch build
on a single arch parent.
The fix here is to look up the architectures produced by the last-shipped build
and simply copy those into our request for the new build (just like we do with
the scm url and koji target). The architectures of the last-shipped build are
pulled from the manifest list api in the registry associated with koji.
There is a corresponding change in OSBS that allows Freshmaker to supply the
list of architectures which should be used for the new build here:
https://github.com/release-engineering/koji-containerbuild/pull/99
We're going from 1 to N architectures now, but in the future we'll make moves
again to go from N to N+1 architectures which warrants the complexity
introduced in this change.