commit 595739bce553e823b65a0c77e5e3bf9dfd7d56ff
author Andrew Geissler <geissonator@yahoo.com> Tue May 19 14:21:49 2020 -0500
committer Andrew Geissler <geissonator@yahoo.com> Thu May 21 18:43:34 2020 +0000
tree 19201b0352c342710254657173a20f2cd99058e5
parent 929034f827c5525f516e75bbb9b41a8e1e32df3a

move unit test docker up to gcc10

The project will soon be moving to gcc10 so ensure we're running it in
CI. Getting to gcc10 required an update to the latest Ubuntu LTS
release. The latest Ubuntu release moved to python 3.8.

Change-Id: I555c446bc9f9ec4b12e6ed270f5689d75586a4e7
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

build-unit-test-docker.sh

diff --git a/build-unit-test-docker.sh b/build-unit-test-docker.sh
index bbd7652..7c00c30 100755
--- a/build-unit-test-docker.sh
+++ b/build-unit-test-docker.sh
@@ -15,7 +15,7 @@
 set -xeuo pipefail
 
 DOCKER_IMG_NAME=${DOCKER_IMG_NAME:-"openbmc/ubuntu-unit-test"}
-DISTRO=${DISTRO:-"ubuntu:eoan"}
+DISTRO=${DISTRO:-"ubuntu:focal"}
 BRANCH=${BRANCH:-"master"}
 
 # Determine the architecture
@@ -164,7 +164,7 @@
 
 ENV DEBIAN_FRONTEND noninteractive
 
-ENV PYTHONPATH "/usr/local/lib/python3.7/site-packages/"
+ENV PYTHONPATH "/usr/local/lib/python3.8/site-packages/"
 
 # We need the keys to be imported for dbgsym repos
 # New releases have a package, older ones fall back to manual fetching
@@ -181,8 +181,8 @@
 RUN cat /etc/apt/sources.list.d/debug.list
 
 RUN apt-get update && apt-get install -yy \
-    gcc-9 \
-    g++-9 \
+    gcc-10 \
+    g++-10 \
     libc6-dbg \
     libc6-dev \
     libtool \
@@ -239,11 +239,11 @@
     device-tree-compiler \
     cppcheck
 
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 900 \
-  --slave /usr/bin/g++ g++ /usr/bin/g++-9 \
-  --slave /usr/bin/gcov gcov /usr/bin/gcov-9 \
-  --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-9 \
-  --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-9
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1000 \
+  --slave /usr/bin/g++ g++ /usr/bin/g++-10 \
+  --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \
+  --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \
+  --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10
 
 RUN pip3 install inflection
 RUN pip3 install pycodestyle

run-unit-test-docker.sh

diff --git a/run-unit-test-docker.sh b/run-unit-test-docker.sh
index b178fa4..fe418b5 100755
--- a/run-unit-test-docker.sh
+++ b/run-unit-test-docker.sh
@@ -32,7 +32,7 @@
 # Default variables
 BRANCH=${BRANCH:-"master"}
 DOCKER_IMG_NAME=${DOCKER_IMG_NAME:-"openbmc/ubuntu-unit-test-${BRANCH}"}
-DISTRO=${DISTRO:-ubuntu:eoan}
+DISTRO=${DISTRO:-ubuntu:focal}
 OBMC_BUILD_SCRIPTS="openbmc-build-scripts"
 UNIT_TEST_PY_DIR="scripts"
 UNIT_TEST_PY="unit-test.py"