Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/65921?usp=email )
Change subject: tests: Abstract the docker image tag for Weekly tests
......................................................................
tests: Abstract the docker image tag for Weekly 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: Iad49cabac9b4000e8570162d3e12453c6d097ee2
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/65921
Reviewed-by: Bobby Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby Bruce <bbr...@ucdavis.edu>
Tested-by: kokoro <noreply+kok...@google.com>
---
M tests/weekly.sh
1 file changed, 23 insertions(+), 3 deletions(-)
Approvals:
kokoro: Regressions pass
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
diff --git a/tests/weekly.sh b/tests/weekly.sh
index 3d8af29..c7f834b 100755
--- a/tests/weekly.sh
+++ b/tests/weekly.sh
@@ -35,6 +35,10 @@
# The per-container Docker memory limit.
docker_mem_limit="24g"
+# The docker tag to use (varies between develop, and versions on the
staging
+# branch)
+tag="latest"
+
# We assume the first two arguments are the number of threads followed by
the
# GPU ISA to test. These default to 1 and GCN3_X86 is no argument is given.
threads=1
@@ -59,7 +63,7 @@
# Run the gem5 very-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 very-long -j${threads} -t${threads} -vv
mkdir -p tests/testing-results
@@ -68,7 +72,7 @@
# before pulling gem5 resources, make sure it doesn't exist already
docker run --rm --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 \
"rm -rf ${gem5_root}/gem5-resources"
# delete Pannotia datasets and output files in case a failed regression
run left
# them around
@@ -113,7 +117,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:${tag}
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/+/65921?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: Iad49cabac9b4000e8570162d3e12453c6d097ee2
Gerrit-Change-Number: 65921
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
