From c9f613a84f565494f394d97b7b70cd1de8a0fb3f Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 27 Aug 2020 18:05:15 -0700 Subject: [PATCH] tests: Use a docker image to build gem5. This will give us control over what tools and packages are in the image, instead of relying on what is provided on the kokoro build machines. Change-Id: I9a9cdedfca4d2e9f31b3e918e01bc660e4d23f64 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33647 Maintainer: Gabe Black Reviewed-by: Jason Lowe-Power Tested-by: kokoro --- tests/jenkins/presubmit-stage2.sh | 49 +++++++++++++++++++++++++++++++ tests/jenkins/presubmit.sh | 22 +++++++++----- 2 files changed, 63 insertions(+), 8 deletions(-) create mode 100755 tests/jenkins/presubmit-stage2.sh diff --git a/tests/jenkins/presubmit-stage2.sh b/tests/jenkins/presubmit-stage2.sh new file mode 100755 index 000000000..be90b2b11 --- /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 6ae96f520..68a73205a 100755 --- a/tests/jenkins/presubmit.sh +++ b/tests/jenkins/presubmit.sh @@ -37,13 +37,19 @@ set -e -# Use ccache with the default directory for caching -export PATH="/usr/lib/ccache:$PATH" +DOCKER_IMAGE=gcr.io/gem5-test/ubuntu-20.04_all-dependencies +PRESUBMIT_STAGE2=tests/jenkins/presubmit-stage2.sh -cd git/jenkins-gem5-prod/tests +# 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 -# 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 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}" -- 2.30.2