Bobby Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/65919?usp=email )
Change subject: tests: Abstract the docker image tag for Nightly tests
......................................................................
tests: Abstract the docker image tag for Nightly tests
This abstraction allows us to more easily change the tags between
different gem5 releases and/or between stable and the develop branch.
Change-Id: Ieb38e9a333ef8592b586014a3a9220f4a18c64e3
---
M tests/nightly.sh
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/tests/nightly.sh b/tests/nightly.sh
index a082158..e6cac2e 100755
--- a/tests/nightly.sh
+++ b/tests/nightly.sh
@@ -35,6 +35,10 @@
# The per-container Docker memory limit.
docker_mem_limit="18g"
+# The docker tag to use (varies between develop, and versions on the
staging
+# branch)
+tag="latest"
+
# The first argument is the number of threads to be used for compilation.
If no
# argument is given we default to one.
compile_threads=1
@@ -66,13 +70,13 @@
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --memory="${docker_mem_limit}" --rm \
- gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest \
+ gcr.io/gem5-test/ubuntu-22.04_all-dependencies:${tag} \
scons build/ALL/unittests.${build} -j${compile_threads} \
--ignore-style
}
# Ensure we have the latest docker images.
-docker pull gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest
+docker pull gcr.io/gem5-test/ubuntu-22.04_all-dependencies:${tag}
# Run the unit tests.
unit_test opt
@@ -81,7 +85,7 @@
# Run the gem5 long tests.
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}"/tests --memory="${docker_mem_limit}" --rm \
- gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest \
+ gcr.io/gem5-test/ubuntu-22.04_all-dependencies:${tag} \
./main.py run --length long -j${compile_threads} -t${run_threads}
-vv
# Unfortunately, due docker being unable run KVM, we do so separately.
@@ -97,10 +101,10 @@
cd "${gem5_root}"
# For the GPU tests we compile and run the GPU ISA inside a gcn-gpu
container.
-docker pull gcr.io/gem5-test/gcn-gpu:latest
+docker pull gcr.io/gem5-test/gcn-gpu:${tag}
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --memory="${docker_mem_limit}" \
- gcr.io/gem5-test/gcn-gpu:latest bash -c \
+ gcr.io/gem5-test/gcn-gpu:${tag} bash -c \
"scons build/${gpu_isa}/gem5.opt -j${compile_threads} --ignore-style \
|| (rm -rf build && scons build/${gpu_isa}/gem5.opt \
-j${compile_threads} --ignore-style)"
@@ -115,7 +119,7 @@
# basic GPU functionality is working.
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --memory="${docker_mem_limit}" \
- gcr.io/gem5-test/gcn-gpu:latest build/${gpu_isa}/gem5.opt \
+ gcr.io/gem5-test/gcn-gpu:${tag} build/${gpu_isa}/gem5.opt \
configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c square
# get HeteroSync
@@ -127,7 +131,7 @@
# atomics are tested.
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --memory="${docker_mem_limit}" \
- gcr.io/gem5-test/gcn-gpu:latest build/${gpu_isa}/gem5.opt \
+ gcr.io/gem5-test/gcn-gpu:${tag} build/${gpu_isa}/gem5.opt \
configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c \
allSyncPrims-1kernel --options="sleepMutex 10 16 4"
@@ -138,7 +142,7 @@
# atomics are tested.
docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --memory="${docker_mem_limit}" \
- gcr.io/gem5-test/gcn-gpu:latest build/${gpu_isa}/gem5.opt \
+ gcr.io/gem5-test/gcn-gpu:${tag} build/${gpu_isa}/gem5.opt \
configs/example/apu_se.py --reg-alloc-policy=dynamic -n3 -c \
allSyncPrims-1kernel --options="lfTreeBarrUniq 10 16 4"
@@ -149,7 +153,7 @@
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --rm --memory="${docker_mem_limit}" \
- gcr.io/gem5-test/sst-env:latest bash -c "\
+ gcr.io/gem5-test/sst-env:${tag} bash -c "\
scons build/${isa}/libgem5_${variant}.so -j${compile_threads} \
--without-tcmalloc --ignore-style; \
cd ext/sst; \
@@ -164,7 +168,7 @@
rm -rf "${gem5_root}/build/ARM"
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --memory="${docker_mem_limit}" --rm \
- gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest bash -c "\
+ gcr.io/gem5-test/ubuntu-22.04_all-dependencies:${tag} bash -c "\
scons -j${compile_threads} --ignore-style build/ARM/gem5.opt; \
scons --with-cxx-config --without-python --without-tcmalloc USE_SYSTEMC=0 \
-j${compile_threads} build/ARM/libgem5_opt.so \
@@ -172,7 +176,7 @@
docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
"${gem5_root}" --memory="${docker_mem_limit}" --rm \
- gcr.io/gem5-test/systemc-env:latest bash -c "\
+ gcr.io/gem5-test/systemc-env:${tag} bash -c "\
cd util/systemc/gem5_within_systemc; \
make -j${compile_threads}; \
../../../build/ARM/gem5.opt ../../../configs/example/se.py -c \
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/65919?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v22-1
Gerrit-Change-Id: Ieb38e9a333ef8592b586014a3a9220f4a18c64e3
Gerrit-Change-Number: 65919
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
