Bobby Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/54470 )
Change subject: misc: Hardcode docker pulls to v21-2 versions
......................................................................
misc: Hardcode docker pulls to v21-2 versions
Change-Id: I404f2c881a00645302c0af5f22e8a59548426cac
---
M tests/jenkins/presubmit.sh
M tests/weekly.sh
M tests/compiler-tests.sh
M tests/nightly.sh
4 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/tests/compiler-tests.sh b/tests/compiler-tests.sh
index 15ffb16..1d1b649 100755
--- a/tests/compiler-tests.sh
+++ b/tests/compiler-tests.sh
@@ -10,17 +10,17 @@
build_dir="${gem5_root}/build"
# All Docker images in the gem5 testing GCR which we want to compile with.
-images=("gcc-version-11"
- "gcc-version-10"
- "gcc-version-9"
- "gcc-version-8"
- "gcc-version-7"
- "clang-version-11"
- "clang-version-10"
- "clang-version-9"
- "clang-version-8"
- "clang-version-7"
- "clang-version-6.0"
+images=("gcc-version-11:v21-2"
+ "gcc-version-10:v21-2"
+ "gcc-version-9:v21-2"
+ "gcc-version-8:v21-2"
+ "gcc-version-7:v21-2"
+ "clang-version-11:v21-2"
+ "clang-version-10:v21-2"
+ "clang-version-9:v21-2"
+ "clang-version-8:v21-2"
+ "clang-version-7:v21-2"
+ "clang-version-6.0:v21-2"
# The following checks our support for Ubuntu 18.04 and 20.04, for
both our
# "minimum dependencies" and "all dependencies" docker images.
"ubuntu-18.04_all-dependencies"
diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index 2aa0c04..d15df01 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -37,8 +37,8 @@
set -e
-DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-20.04_all-dependencies
-DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-9
+DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2
+DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-9:v21-2
PRESUBMIT_STAGE2=tests/jenkins/presubmit-stage2.sh
GEM5ART_TESTS=tests/jenkins/gem5art-tests.sh
diff --git a/tests/nightly.sh b/tests/nightly.sh
index e7f29ec..e04c150 100755
--- a/tests/nightly.sh
+++ b/tests/nightly.sh
@@ -53,7 +53,8 @@
# SCons is not perfect, and occasionally does not catch a necessary
# compilation: https://gem5.atlassian.net/browse/GEM5-753
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}" --rm gcr.io/gem5-test/ubuntu-20.04_all-dependencies
\
+ "${gem5_root}" --rm \
+ gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2 \
bash -c "scons build/${isa}/gem5.opt -j${compile_threads} \
|| (rm -rf build && scons build/${isa}/gem5.opt
-j${compile_threads})"
}
@@ -62,12 +63,13 @@
build=$1
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}" --rm gcr.io/gem5-test/ubuntu-20.04_all-dependencies
\
+ "${gem5_root}" --rm \
+ gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2 \
scons build/NULL/unittests.${build} -j${compile_threads}
}
# Ensure we have the latest docker images.
-docker pull gcr.io/gem5-test/ubuntu-20.04_all-dependencies
+docker pull gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2
# Try to build the ISA targets.
build_target NULL
@@ -84,14 +86,15 @@
# Run the gem5 long tests.
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}"/tests --rm
gcr.io/gem5-test/ubuntu-20.04_all-dependencies \
+ "${gem5_root}"/tests --rm \
+ gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2 \
./main.py run --length long -j${compile_threads} -t${run_threads}
-vv
# Run the GPU tests.
# For the GPU tests we compile and run GCN3_X86 inside a gcn-gpu container.
-docker pull gcr.io/gem5-test/gcn-gpu:latest
+docker pull gcr.io/gem5-test/gcn-gpu::v21-2
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest bash -c \
+ "${gem5_root}" gcr.io/gem5-test/gcn-gpu::v21-2 bash -c \
"scons build/GCN3_X86/gem5.opt -j${compile_threads} \
|| (rm -rf build && scons build/GCN3_X86/gem5.opt
-j${compile_threads})"
@@ -104,7 +107,7 @@
# Thus, we always want to run this in the nightly regressions to make sure
# basic GPU functionality is working.
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest build/GCN3_X86/gem5.opt
\
+ "${gem5_root}" gcr.io/gem5-test/gcn-gpu:v21-2 build/GCN3_X86/gem5.opt \
configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c square
# get HeteroSync
@@ -115,7 +118,7 @@
# moderate contention case for the default 4 CU GPU config and help ensure
GPU
# atomics are tested.
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest build/GCN3_X86/gem5.opt
\
+ "${gem5_root}" gcr.io/gem5-test/gcn-gpu:v21-2 build/GCN3_X86/gem5.opt \
configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c \
allSyncPrims-1kernel --options="sleepMutex 10 16 4"
@@ -125,7 +128,7 @@
# moderate contention case for the default 4 CU GPU config and help ensure
GPU
# atomics are tested.
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest build/GCN3_X86/gem5.opt
\
+ "${gem5_root}" gcr.io/gem5-test/gcn-gpu:v21-2 build/GCN3_X86/gem5.opt \
configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c \
allSyncPrims-1kernel --options="lfTreeBarrUniq 10 16 4"
@@ -135,7 +138,7 @@
variant=$2
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}" --rm gcr.io/gem5-test/sst-env \
+ "${gem5_root}" --rm gcr.io/gem5-test/sst-env:v21-2 \
bash -c "\
scons build/${isa}/libgem5_${variant}.so -j${compile_threads}
--without-tcmalloc; \
cd ext/sst; \
diff --git a/tests/weekly.sh b/tests/weekly.sh
index b6bbb58..98e87df 100755
--- a/tests/weekly.sh
+++ b/tests/weekly.sh
@@ -41,7 +41,8 @@
# Run the gem5 very-long tests.
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}"/tests --rm
gcr.io/gem5-test/ubuntu-20.04_all-dependencies \
+ "${gem5_root}"/tests --rm \
+ gcr.io/gem5-test/ubuntu-20.04_all-dependencies:v21-2 \
./main.py run --length very-long -j${threads} -t${threads} -vv
mkdir -p tests/testing-results
@@ -49,7 +50,7 @@
# GPU weekly tests start here
# before pulling gem5 resources, make sure it doesn't exist already
docker run --rm --volume "${gem5_root}":"${gem5_root}" -w \
- "${gem5_root}" gcr.io/gem5-test/gcn-gpu:latest bash -c \
+ "${gem5_root}" gcr.io/gem5-test/gcn-gpu:v21-2 bash -c \
"rm -rf ${gem5_root}/gem5-resources"
# delete Pannotia datasets and output files in case a failed regression
run left
# them around
@@ -89,7 +90,7 @@
# avoid needing to set all of these, we instead build a docker for it,
which
# has all these variables pre-set in its Dockerfile
# To avoid compiling gem5 multiple times, all GPU benchmarks will use this
-docker pull gcr.io/gem5-test/gcn-gpu:latest
+docker pull gcr.io/gem5-test/gcn-gpu:v21-2
docker build -t hacc-test-weekly
${gem5_root}/gem5-resources/src/gpu/halo-finder
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54470
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-2
Gerrit-Change-Id: I404f2c881a00645302c0af5f22e8a59548426cac
Gerrit-Change-Number: 54470
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce <[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
