From 38f34abc7720cadaf322e156d0b9227686fd5eb9 Mon Sep 17 00:00:00 2001 From: Charles Oliveira Date: Thu, 7 Dec 2023 11:19:56 -0300 Subject: [PATCH] ci/backend/tuxsuite.py: allow dots in tuxsuite job id Signed-off-by: Charles Oliveira --- squad/ci/backend/tuxsuite.py | 2 +- test/ci/backend/test_tuxsuite.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/squad/ci/backend/tuxsuite.py b/squad/ci/backend/tuxsuite.py index 12daff9b..5df6fff8 100644 --- a/squad/ci/backend/tuxsuite.py +++ b/squad/ci/backend/tuxsuite.py @@ -107,7 +107,7 @@ def parse_job_id(self, job_id): """ - regex = r'^(OEBUILD|BUILD|TEST):([0-9a-z_\-]+@[0-9a-z_\-]+)#([a-zA-Z0-9]+)$' + regex = r'^(OEBUILD|BUILD|TEST):([0-9a-z_\-.]+@[0-9a-z_\-.]+)#([a-zA-Z0-9]+)$' matches = re.findall(regex, job_id) if len(matches) == 0: raise FetchIssue(f'Job id "{job_id}" does not match "{regex}"') diff --git a/test/ci/backend/test_tuxsuite.py b/test/ci/backend/test_tuxsuite.py index 84b14a7d..c096fae2 100644 --- a/test/ci/backend/test_tuxsuite.py +++ b/test/ci/backend/test_tuxsuite.py @@ -114,6 +114,9 @@ def test_parse_job_id(self): result = self.tuxsuite.parse_job_id('TEST:linaro@anders#1yPYGaOEPNwr2pCqBgONY43zORq') self.assertEqual(('TEST', 'linaro@anders', '1yPYGaOEPNwr2pCqBgONY43zORq'), result) + result = self.tuxsuite.parse_job_id('TEST:linaro.ltd@anders.roxel#1yPYGaOEPNwr2pCqBgONY43zORq') + self.assertEqual(('TEST', 'linaro.ltd@anders.roxel', '1yPYGaOEPNwr2pCqBgONY43zORq'), result) + with self.assertRaises(FetchIssue): self.tuxsuite.parse_job_id('not-really-vallid')