gem5-dev@gem5.org

The gem5 Developer List

View all threads

[S] Change in gem5/gem5[develop]: misc: Revert "tests: Update the Weekly tests' docker version..."

BB
Bobby Bruce (Gerrit)
Mon, Jun 20, 2022 7:56 PM

Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/60634 )

Change subject: misc: Revert "tests: Update the Weekly tests' docker
version..."
......................................................................

misc: Revert "tests: Update the Weekly tests' docker version..."

This reverts commit ac7d7a7d7ae536bb4cf3c9d0c431f5fb65548b04.
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 bbruce@ucdavis.edu
Maintainer: Bobby Bruce bbruce@ucdavis.edu
Tested-by: kokoro noreply+kokoro@google.com

M tests/weekly.sh
1 file changed, 19 insertions(+), 3 deletions(-)

Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass

diff --git a/tests/weekly.sh b/tests/weekly.sh
index 8b16907..98bc47e 100755
--- a/tests/weekly.sh
+++ b/tests/weekly.sh
@@ -59,7 +59,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-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
@@ -68,7 +68,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: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

@@ -113,7 +113,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: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 \

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/60634
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ib971a602057856204a385bd95e5ad61125167eac
Gerrit-Change-Number: 60634
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby Bruce bbruce@ucdavis.edu
Gerrit-Reviewer: Bobby Bruce bbruce@ucdavis.edu
Gerrit-Reviewer: Jason Lowe-Power jason@lowepower.com
Gerrit-Reviewer: kokoro noreply+kokoro@google.com
Gerrit-MessageType: merged

Bobby Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/60634 ) Change subject: misc: Revert "tests: Update the Weekly tests' docker version..." ...................................................................... misc: Revert "tests: Update the Weekly tests' docker version..." This reverts commit ac7d7a7d7ae536bb4cf3c9d0c431f5fb65548b04. 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 <bbruce@ucdavis.edu> Maintainer: Bobby Bruce <bbruce@ucdavis.edu> Tested-by: kokoro <noreply+kokoro@google.com> --- M tests/weekly.sh 1 file changed, 19 insertions(+), 3 deletions(-) Approvals: Bobby Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/tests/weekly.sh b/tests/weekly.sh index 8b16907..98bc47e 100755 --- a/tests/weekly.sh +++ b/tests/weekly.sh @@ -59,7 +59,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-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 @@ -68,7 +68,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: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 @@ -113,7 +113,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: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 \ -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/60634 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: Ib971a602057856204a385bd95e5ad61125167eac Gerrit-Change-Number: 60634 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Jason Lowe-Power <jason@lowepower.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-MessageType: merged