From eb3f8a71aff8794dc6fd46b26a585f8814f5f66e Mon Sep 17 00:00:00 2001 From: Mikhail Gordeev Date: Mon, 26 Aug 2024 21:22:01 +0300 Subject: [PATCH] Pass lowered branch to the m-p --- cloud_build/cloud_build.py | 2 +- tests/test_integration_images.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cloud_build/cloud_build.py b/cloud_build/cloud_build.py index da8f73b..40441d8 100755 --- a/cloud_build/cloud_build.py +++ b/cloud_build/cloud_build.py @@ -684,7 +684,7 @@ Dir::Etc::preferencesparts "/var/empty"; 'make', f'APTCONF={apt_dir}/apt.conf.{branch}.{arch}', f'ARCH={arch}', - f'BRANCH={branch}', + f'BRANCH={branch.lower()}', f'IMAGE_OUTDIR={self.out_dir}', f'IMAGE_OUTFILE={tarball_name}', ] diff --git a/tests/test_integration_images.py b/tests/test_integration_images.py index 60a00bf..9ad1fd8 100644 --- a/tests/test_integration_images.py +++ b/tests/test_integration_images.py @@ -163,6 +163,16 @@ class TestIntegrationImages(TestCase): image = self.image_path(branch, arch, image) 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): self.assertIn( "BRANDING=alt-starterkit",