Skip to content

Commit

Permalink
misc: Revert "tests: Update the Weekly tests' docker version..."
Browse files Browse the repository at this point in the history
This reverts commit ac7d7a7.
https://gem5-review.googlesource.com/c/public/gem5/+/60550

Change-Id: Ib971a602057856204a385bd95e5ad61125167eac
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/60634
Reviewed-by: Bobby Bruce <[email protected]>
Maintainer: Bobby Bruce <[email protected]>
Tested-by: kokoro <[email protected]>
  • Loading branch information
BobbyRBruce committed Jun 20, 2022
1 parent e42ce2c commit 99cfda3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tests/weekly.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fi
# 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-20.04_all-dependencies:v22-0 \
gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest \
./main.py run --length very-long -j${threads} -t${threads} -vv

mkdir -p tests/testing-results
Expand All @@ -68,7 +68,7 @@ mkdir -p tests/testing-results
# 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:v22-0 bash -c \
gcr.io/gem5-test/gcn-gpu:latest bash -c \
"rm -rf ${gem5_root}/gem5-resources"
# delete Pannotia datasets and output files in case a failed regression run left
# them around
Expand Down Expand Up @@ -113,7 +113,7 @@ cd "${gem5_root}"
# 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:v22-0
docker pull gcr.io/gem5-test/gcn-gpu:latest
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 \
Expand Down

0 comments on commit 99cfda3

Please sign in to comment.