diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-28 18:02:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-30 22:22:19 +0000 |
commit | d1622b87f8cd9244e503a0a8d9cd056638499525 (patch) | |
tree | e17ad29be133f94067df241481afc3baafe56673 /meta/lib | |
parent | 91d11b3ad862a241c7315c04e05c1cc29d41ad3d (diff) | |
download | poky-d1622b87f8cd9244e503a0a8d9cd056638499525.tar.gz |
selftest/sstatetests: run CDN check twice, ignoring errors the first time
The current CDN isn't able to serve all objects on first request, and it
was suggested to work around that by trying again:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=15335#c16
Once CDN moves to a better location this can probably be reverted.
[YOCTO #15335]
(From OE-Core rev: 0db3466303f56736d2fa9a105435eaaadb385082)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/sstatetests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 031c2266ac..e2f509c3e8 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py | |||
@@ -959,7 +959,7 @@ class SStateMirrors(SStateBase): | |||
959 | self.assertEqual(len(failed_urls), missing_objects, "Amount of reported missing objects does not match failed URLs: {}\nFailed URLs:\n{}\nFetcher diagnostics:\n{}".format(missing_objects, "\n".join(failed_urls), "\n".join(failed_urls_extrainfo))) | 959 | self.assertEqual(len(failed_urls), missing_objects, "Amount of reported missing objects does not match failed URLs: {}\nFailed URLs:\n{}\nFetcher diagnostics:\n{}".format(missing_objects, "\n".join(failed_urls), "\n".join(failed_urls_extrainfo))) |
960 | self.assertEqual(len(failed_urls), 0, "Missing objects in the cache:\n{}\nFetcher diagnostics:\n{}".format("\n".join(failed_urls), "\n".join(failed_urls_extrainfo))) | 960 | self.assertEqual(len(failed_urls), 0, "Missing objects in the cache:\n{}\nFetcher diagnostics:\n{}".format("\n".join(failed_urls), "\n".join(failed_urls_extrainfo))) |
961 | 961 | ||
962 | def run_test(self, machine, targets, exceptions, check_cdn = True): | 962 | def run_test(self, machine, targets, exceptions, check_cdn = True, ignore_errors = False): |
963 | # sstate is checked for existence of these, but they never get written out to begin with | 963 | # sstate is checked for existence of these, but they never get written out to begin with |
964 | exceptions += ["{}.*image_qa".format(t) for t in targets.split()] | 964 | exceptions += ["{}.*image_qa".format(t) for t in targets.split()] |
965 | exceptions += ["{}.*deploy_source_date_epoch".format(t) for t in targets.split()] | 965 | exceptions += ["{}.*deploy_source_date_epoch".format(t) for t in targets.split()] |
@@ -984,14 +984,18 @@ MACHINE = "{}" | |||
984 | """.format(machine)) | 984 | """.format(machine)) |
985 | result = bitbake("-DD -n {}".format(targets)) | 985 | result = bitbake("-DD -n {}".format(targets)) |
986 | bitbake("-S none {}".format(targets)) | 986 | bitbake("-S none {}".format(targets)) |
987 | if ignore_errors: | ||
988 | return | ||
987 | self.check_bb_output(result.output, exceptions, check_cdn) | 989 | self.check_bb_output(result.output, exceptions, check_cdn) |
988 | 990 | ||
989 | def test_cdn_mirror_qemux86_64(self): | 991 | def test_cdn_mirror_qemux86_64(self): |
990 | exceptions = [] | 992 | exceptions = [] |
993 | self.run_test("qemux86-64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions, ignore_errors = True) | ||
991 | self.run_test("qemux86-64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) | 994 | self.run_test("qemux86-64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) |
992 | 995 | ||
993 | def test_cdn_mirror_qemuarm64(self): | 996 | def test_cdn_mirror_qemuarm64(self): |
994 | exceptions = [] | 997 | exceptions = [] |
998 | self.run_test("qemuarm64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions, ignore_errors = True) | ||
995 | self.run_test("qemuarm64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) | 999 | self.run_test("qemuarm64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) |
996 | 1000 | ||
997 | def test_local_cache_qemux86_64(self): | 1001 | def test_local_cache_qemux86_64(self): |