Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33615 )
Change subject: docker test
......................................................................
docker test
Change-Id: I9a9cdedfca4d2e9f31b3e918e01bc660e4d23f64
---
A tests/jenkins/presubmit-stage2.sh
M tests/jenkins/presubmit.sh
2 files changed, 64 insertions(+), 6 deletions(-)
diff --git a/tests/jenkins/presubmit-stage2.sh
b/tests/jenkins/presubmit-stage2.sh
new file mode 100755
index 0000000..be90b2b
--- /dev/null
+++ b/tests/jenkins/presubmit-stage2.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The Regents of the University of California
+# All rights reserved
+#
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder. You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+set -e
+
+# Use ccache with the default directory for caching
+#XXX Not available in docker image.
+#export PATH="/usr/lib/ccache:$PATH"
+
+# Build with 4 threads (i.e., pass -j4 to scons)
+# Run 4 tests in parallel
+# Look for tests in the gem5 subdirectory
+# Once complete, run the Google Tests
+cd tests
+./main.py run -j4 -t4 gem5 && scons -C .. build/NULL/unittests.opt
diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index 6ae96f5..5a5adbc 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -40,10 +40,19 @@
# Use ccache with the default directory for caching
export PATH="/usr/lib/ccache:$PATH"
-cd git/jenkins-gem5-prod/tests
+DOCKER_IMAGE=gcr.io/gem5-test/ubuntu-20.04_all-dependencies
+PRESUBMIT_STAGE2=tests/jenkins/presubmit_stage2.sh
-# Build with 4 threads (i.e., pass -j4 to scons)
-# Run 4 tests in parallel
-# Look for tests in the gem5 subdirectory
-# Once complete, run the Google Tests
-./main.py run -j4 -t4 gem5 && scons -C .. build/NULL/unittests.opt
+# Move the docker base directory to tempfs.
+sudo /etc/init.d/docker stop
+sudo mv /var/lib/docker /tmpfs/
+sudo ln -s /tmpfs/docker /var/lib/docker
+sudo /etc/init.d/docker start
+
+# Move the CWD to the gem5 checkout.
+cd git/jenkins-gem5-prod/
+
+# Enter a docker image which has all the tools we need, and run the actual
+# presubmit tests.
+docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) --rm \
+ "${DOCKER_IMAGE}" "${PRESUBMIT_STAGE2}"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33615
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: docker-test
Gerrit-Change-Id: I9a9cdedfca4d2e9f31b3e918e01bc660e4d23f64
Gerrit-Change-Number: 33615
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
