diff options
| author | Charles Oliveira <charles.oliveira@linaro.org> | 2021-01-22 14:54:58 -0300 |
|---|---|---|
| committer | Charles Oliveira <charles.oliveira@linaro.org> | 2021-01-22 14:54:58 -0300 |
| commit | 2a5a140d07cb413b73be65e9f55aa876423ee500 (patch) | |
| tree | 299b1375c4851932e05868e361d41825736411f0 | |
| parent | 1e2eff7ef25bde97cf4218e9063f4045f7929b0a (diff) | |
commands: submit_tuxbuild: fix key in case of builds with dotted version
Signed-off-by: Charles Oliveira <charles.oliveira@linaro.org>
| -rw-r--r-- | squad_client/commands/submit_tuxbuild.py | 4 | ||||
| -rw-r--r-- | tests/data/submit/tuxbuild/build.json | 26 | ||||
| -rw-r--r-- | tests/test_submit_tuxbuild.py | 7 |
3 files changed, 34 insertions, 3 deletions
diff --git a/squad_client/commands/submit_tuxbuild.py b/squad_client/commands/submit_tuxbuild.py index 567f451..8fdc00a 100644 --- a/squad_client/commands/submit_tuxbuild.py +++ b/squad_client/commands/submit_tuxbuild.py @@ -108,14 +108,14 @@ class SubmitTuxbuildCommand(SquadClientCommand): toolchain = build["toolchain"] test = self._get_test_name(kconfig, toolchain) - multi_key = "%s.%s" % (description, arch) + multi_key = (description, arch) if multi_key not in data: data[multi_key] = {} data[multi_key].update({test: status}) for key, result in data.items(): - description, arch = key.split(".", 1) + description, arch = key submit_results( group_project_slug="%s/%s" % (args.group, args.project), build_version=description, diff --git a/tests/data/submit/tuxbuild/build.json b/tests/data/submit/tuxbuild/build.json index bdefd53..472e0c0 100644 --- a/tests/data/submit/tuxbuild/build.json +++ b/tests/data/submit/tuxbuild/build.json @@ -51,5 +51,31 @@ "toolchain": "gcc-9", "tuxbuild_status": "complete", "warnings_count": 2 + }, + { + "build_key": "B3TECkH4_1X9yKoWOPIhed", + "build_status": "fail", + "client_token": "32b482ac-2cc1-4f68-bf73-cc9f780b72cf", + "download_url": "https://builds.tuxbuild.com/B3TECkH4_1X9yKoWOPIhew/", + "errors_count": 2, + "git_describe": "v4.4.4", + "git_repo": "https://gitlab.com/Linaro/lkft/mirrors/next/linux-next", + "git_sha": "5302568121ba345f5c22528aefd72d775f25221e", + "git_short_log": "5302568121ba (\"Add linux-next specific files for 20201021\")", + "kconfig": [ + "defconfig", + "https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linux/files/lkft.config", + "https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linux/files/lkft-crypto.config", + "https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linux/files/distro-overrides.config", + "https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linux/files/systemd.config", + "https://raw.githubusercontent.com/Linaro/meta-lkft/sumo/recipes-kernel/linux/files/virtio.config", + "CONFIG_ARM64_MODULE_PLTS=y" + ], + "kernel_version": "5.9.0", + "status_message": "build failed due to compilation error(s)", + "target_arch": "arm64", + "toolchain": "gcc-9", + "tuxbuild_status": "complete", + "warnings_count": 2 } ] diff --git a/tests/test_submit_tuxbuild.py b/tests/test_submit_tuxbuild.py index 52373ce..24ddfa3 100644 --- a/tests/test_submit_tuxbuild.py +++ b/tests/test_submit_tuxbuild.py @@ -51,13 +51,18 @@ class SubmitTuxbuildCommandTest(unittest.TestCase): def test_submit_tuxbuild_build(self): proc = self.submit_tuxbuild("tests/data/submit/tuxbuild/build.json") self.assertTrue(proc.ok, msg=proc.err) - self.assertTrue(proc.err.count("Submitting 1 tests") == 2) + self.assertTrue(proc.err.count("Submitting 1 tests") == 3) build = ( self.squad.group("my_group").project("my_project").build("next-20201021") ) self.assertIsNotNone(build) + build = ( + self.squad.group("my_group").project("my_project").build("v4.4.4") + ) + self.assertIsNotNone(build) + for arch in ["arm64", "x86"]: environment = ( self.squad.group("my_group").project("my_project").environment(arch) |