[f20] align testexeccontainer metadata/results with testexecserver
BUG=None
TEST=run_docker.py
Change-Id: Ia09a46adc9b592df614c110ea9512709d56df1fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3114600
Tested-by: Derek Beckett <dbeckett@chromium.org>
Auto-Submit: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Jesse McGuire <jessemcguire@google.com>
Reviewed-by: Seewai Fu <seewaifu@google.com>
Commit-Queue: Derek Beckett <dbeckett@chromium.org>
diff --git a/test/container/dockerfiles/Dockerfile b/test/container/dockerfiles/Dockerfile
index 7a5d64f..74af2f7 100644
--- a/test/container/dockerfiles/Dockerfile
+++ b/test/container/dockerfiles/Dockerfile
@@ -59,16 +59,17 @@
# Test service *must* be cp'd into the dockerfile dir prior.
COPY testexecserver /usr/bin/
+RUN mkdir -p /tmp/test
# Bring in metadata to 1 location
-COPY *.pb /tmp/testexecserver/metadata/
+COPY *.pb /tmp/test/metadata/
RUN sudo ln -s /usr/local/autotest/site_utils/test_that.py /usr/bin/test_that
# Own testexecserver & metadata
RUN chown -R chromeos-test:chromeos-test /usr/bin/testexecserver
RUN chmod 755 /usr/bin/testexecserver
-RUN chown -R chromeos-test:chromeos-test /tmp/testexecserver/
-RUN chmod 755 /tmp/testexecserver/metadata/*.pb
+RUN chown -R chromeos-test:chromeos-test /tmp/test/
+RUN chmod 755 /tmp/test/metadata/*.pb
USER chromeos-test
diff --git a/test/container/utils/run_docker.py b/test/container/utils/run_docker.py
index 8ffcf8e..7aff0c9 100755
--- a/test/container/utils/run_docker.py
+++ b/test/container/utils/run_docker.py
@@ -48,7 +48,7 @@
help='Results volume on local fs')
parser.add_argument('--target_results', type=str,
dest='target_results',
- default='/tmp/results/',
+ default='/tmp/test/results/',
help='Results volume on docker fs')
parser.add_argument('-bin', '--bin', dest='bin', type=str,
default='testexecserver',
