build-unit-test-docker: update ubuntu to kinetic
The clang-15 packages are only going to be available in kinetic
or later. Switch the docker base to that distro version. That
version already has the autoconf-archive required for C++20 and
it has gcc-12 by default, so we can remove (or comment for the time
being) some workarounds we had.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I6eb7fd7218027941af949522e043ed5dd6ea4f9b
diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 7760153..e55d7fe 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -627,7 +627,7 @@
docker_image_name = os.environ.get("DOCKER_IMAGE_NAME", "openbmc/ubuntu-unit-test")
force_build = os.environ.get("FORCE_DOCKER_BUILD")
is_automated_ci_build = os.environ.get("BUILD_URL", False)
-distro = os.environ.get("DISTRO", "ubuntu:jammy")
+distro = os.environ.get("DISTRO", "ubuntu:kinetic")
branch = os.environ.get("BRANCH", "master")
ubuntu_mirror = os.environ.get("UBUNTU_MIRROR")
http_proxy = os.environ.get("http_proxy")
@@ -794,18 +794,15 @@
rsync \
libcryptsetup-dev
-# Apply autoconf-archive-v2022.02.11 file ax_cxx_compile_stdcxx for C++20.
-RUN curl "http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_cxx_compile_stdcxx.m4;hb=3311b6bdeff883c6a13952594a9dcb60bce6ba80" \
- > /usr/share/aclocal/ax_cxx_compile_stdcxx.m4
-
RUN npm install -g eslint@latest eslint-plugin-json@latest
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 \
- --slave /usr/bin/g++ g++ /usr/bin/g++-12 \
- --slave /usr/bin/gcov gcov /usr/bin/gcov-12 \
- --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-12 \
- --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-12
-RUN update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-12 12
+# Kinetic comes with GCC-12, so skip this.
+#RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 \
+# --slave /usr/bin/g++ g++ /usr/bin/g++-12 \
+# --slave /usr/bin/gcov gcov /usr/bin/gcov-12 \
+# --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-12 \
+# --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-12
+#RUN update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-12 12
RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 1000 \
--slave /usr/bin/clang++ clang++ /usr/bin/clang++-14 \