alt/cloud-build
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix not creating images when rebuild

Browse Source
This commit is contained in:
Mikhail Gordeev 2020-05-05 21:20:50 +03:00
parent 22b02666f4
commit 2135f80dac
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloud_build/cloud_build.py
View File

@ -508,7 +508,7 @@ Dir::Etc::preferencesparts "/var/empty";
full_target = f'{target}.{kind}' full_target = f'{target}.{kind}'
tarball_name = f'{image}-{arch}.{kind}' tarball_name = f'{image}-{arch}.{kind}'
tarball_path = self.out_dir / tarball_name tarball_path = self.out_dir / tarball_name
result = None result: Optional[Path] = tarball_path
apt_dir = self.work_dir / 'apt' apt_dir = self.work_dir / 'apt'
with self.pushd(self.work_dir / 'mkimage-profiles'): with self.pushd(self.work_dir / 'mkimage-profiles'):
if not self.should_rebuild(tarball_path): if not self.should_rebuild(tarball_path):
@ -527,8 +527,8 @@ Dir::Etc::preferencesparts "/var/empty";
if os.path.exists(tarball_path): if os.path.exists(tarball_path):
self.info(f'End building of {full_target} {arch}') self.info(f'End building of {full_target} {arch}')
result = tarball_path
else: else:
result = None
self.build_failed(full_target, arch) self.build_failed(full_target, arch)
return result return result

15
tests/test_rebuild.py
View File

@ -48,3 +48,18 @@ class TestErrors(TestCase):
self.cb.create_images() self.cb.create_images()
except BuildError: except BuildError:
self.fail(msg) self.fail(msg)
@mock.patch('subprocess.call', call.Call())
def test_dont_create_image_when_rebuild(self):
tarball = self.data_dir / 'out/docker_Sisyphus-x86_64.tar.xz'
tarball.touch()
self.cb.create_images()
image = (
self.data_dir
/ 'images'
/ 'Sisyphus'
/ 'alt-sisyphus-rootfs-minimal-x86_64.tar.xz'
)
msg = 'Do not create image when rebuild'
if not image.exists():
self.fail(msg)