diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2023-02-28 19:06:37 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2023-03-01 10:31:46 +0000 |
| commit | 171080d8913c580f67f196d3834b99fa7e234140 (patch) | |
| tree | 90eba5cefb72ba5fb9f7bedce5a398574509dee4 /tests/lcitool/refresh | |
| parent | 7c7d369b33f01d3705a14c361689776de6bb5b7a (diff) | |
| download | qemu-171080d8913c580f67f196d3834b99fa7e234140.zip qemu-171080d8913c580f67f196d3834b99fa7e234140.tar.gz qemu-171080d8913c580f67f196d3834b99fa7e234140.tar.bz2 | |
testing: update ubuntu2004 to ubuntu2204
The 22.04 LTS release has been out for almost a year now so its time
to update all the remaining images to the current LTS. We can also
drop some hacks we need for older clang TSAN support.
We will keep the ubuntu2004 container around for those who wish to
test builds on the currently still supported baseline.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230228190653.1602033-9-alex.bennee@linaro.org>
Diffstat (limited to 'tests/lcitool/refresh')
| -rwxr-xr-x | tests/lcitool/refresh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index a5ea0ef..cc9e34a 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -69,13 +69,6 @@ def generate_cirrus(target, trailer=None): generate(filename, cmd, trailer) -ubuntu2004_tsanhack = [ - "# Apply patch https://reviews.llvm.org/D75820\n", - "# This is required for TSan in clang-10 to compile with QEMU.\n", - "RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h\n" -] - - # Netmap still needs to be manually built as it is yet to be packaged # into a distro. We also add cscope and gtags which are used in the CI # test @@ -113,8 +106,8 @@ try: trailer="".join(debian11_extras)) generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") - generate_dockerfile("ubuntu2004", "ubuntu-2004", - trailer="".join(ubuntu2004_tsanhack)) + generate_dockerfile("ubuntu2004", "ubuntu-2004") + generate_dockerfile("ubuntu2204", "ubuntu-2204") # # Cross compiling builds |