commit 531ffbc86d22ddfa66618361b5091c0f0e2b7e75
author Derek Beckett <dbeckett@chromium.org> Wed Jun 23 11:58:57 2021 -0700
committer Commit Bot <commit-bot@chromium.org> Mon Jun 28 06:10:35 2021 +0000
tree 817b599cf2afb6fb40e244afdf73ce1aabde0924
parent 3295e677c8f2e9236d520373c77a9115a0a36fa9

[F20] Removing lsb-utils, and python3 from usr/bin

Also, adding a symlink to test_that

BUG=b:188712077
TEST=test_that inside container.

Change-Id: I7e34f6f8910c815cfe937448ccfa51fd43180022
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2983645
Tested-by: Derek Beckett <dbeckett@chromium.org>
Auto-Submit: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>
Commit-Queue: Derek Beckett <dbeckett@chromium.org>

test/container/dockerfiles/Dockerfile

diff --git a/test/container/dockerfiles/Dockerfile b/test/container/dockerfiles/Dockerfile
index 0033af3..b25b136 100644
--- a/test/container/dockerfiles/Dockerfile
+++ b/test/container/dockerfiles/Dockerfile
@@ -8,7 +8,6 @@
     && apt-get install -y \
       ca-certificates \
       curl \
-      lsb-release \
       iproute2 \
       iputils-ping \
       python2.7 \
@@ -29,6 +28,10 @@
 RUN rm -rf /usr/lib/google-cloud-sdk/bin/anthoscli \
   /usr/lib/google-cloud-sdk/bin/kuberun
 
+# Point /usr/bin/python3 to usr/local/bin/python3. See b/191884161
+RUN sudo rm /usr/bin/python3*
+RUN sudo ln -s /usr/local/bin/python3 /usr/bin/python3
+
 # Config the user
 RUN useradd -m chromeos-test
 # Add passwordless sudo for chromeos-test.
@@ -56,6 +59,8 @@
 # Test service *must* be cp'd into the dockerfile dir prior.
 COPY testexecserver /usr/bin/
 
+RUN sudo ln -s /usr/local/autotest/site_utils/test_that.py /usr/bin/test_that
+
 # Own testexecserver
 RUN chown -R chromeos-test:chromeos-test /usr/bin/testexecserver
 RUN chmod 755 /usr/bin/testexecserver