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

Pass lowered branch to the m-p
Some checks failed
Building images / Building ve-x86 process (push) Failing after 1s
Details

Browse Source
This commit is contained in:
Mikhail Gordeev 2024-08-26 21:22:01 +03:00 committed by Nadezhda Fedorova
parent 43b5a8e1cd
commit eb3f8a71af
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud_build/cloud_build.py
View File

@ -684,7 +684,7 @@ Dir::Etc::preferencesparts "/var/empty";
'make', 'make',
f'APTCONF={apt_dir}/apt.conf.{branch}.{arch}', f'APTCONF={apt_dir}/apt.conf.{branch}.{arch}',
f'ARCH={arch}', f'ARCH={arch}',
f'BRANCH={branch}', f'BRANCH={branch.lower()}',
f'IMAGE_OUTDIR={self.out_dir}', f'IMAGE_OUTDIR={self.out_dir}',
f'IMAGE_OUTFILE={tarball_name}', f'IMAGE_OUTFILE={tarball_name}',
] ]

10
tests/test_integration_images.py
View File

@ -163,6 +163,16 @@ class TestIntegrationImages(TestCase):
image = self.image_path(branch, arch, image) image = self.image_path(branch, arch, image)
return json.loads(image.read_text()) return json.loads(image.read_text())
def test_branch_sisyphus_cloud(self):
self.assertIn(
"BRANCH=sisyphus",
self.get_make_args(
'Sisyphus',
'x86_64',
'alt-sisyphus-cloud-x86_64.qcow2',
),
)
def test_branding_present_p9_rootfs_minimal(self): def test_branding_present_p9_rootfs_minimal(self):
self.assertIn( self.assertIn(
"BRANDING=alt-starterkit", "BRANDING=alt-starterkit",