From 21cb85f201ba729c4f56ebcdc0823757507b7de7 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Mon, 10 Oct 2022 11:35:06 -0700 Subject: [PATCH] tests: Updating the tests to use Ubuntu 22.04 docker image As of https://gem5-review.googlesource.com/c/public/gem5/+/64177 we support version 22.04. This patch therefore updates the testing infrastructure (kokoro/quick, nightly/long, weekly/extra-long) to use the Ubuntu 22.04 docker image. The "jenkins/gem5art-tests.sh" test script has been updated to no longer require the `pip upgrade`. This was needed for Ubuntu 20.04 as it utilized an older version of pip which did not have all the dependencies these tests requried. As of Ubuntu 20.04 this is no longer required. Change-Id: Ia8f8b1b2c62ad5d5a8419cb31b6a1d2b6dff7ac9 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/64291 Maintainer: Jason Lowe-Power Tested-by: kokoro Reviewed-by: Jason Lowe-Power --- tests/jenkins/gem5art-tests.sh | 8 -------- tests/jenkins/presubmit.sh | 2 +- tests/nightly.sh | 10 +++++----- tests/weekly.sh | 2 +- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/tests/jenkins/gem5art-tests.sh b/tests/jenkins/gem5art-tests.sh index b9dee556b6..c655fbbc8c 100755 --- a/tests/jenkins/gem5art-tests.sh +++ b/tests/jenkins/gem5art-tests.sh @@ -43,14 +43,6 @@ mkdir -p .pyenv python3 -m venv .pyenv source .pyenv/bin/activate -# The 20.04_all-dependencies image has a slightly outdated version of pip which -# causes problems when trying to install the celery package. The error -# is `invalid command 'bdist_wheel'`, which can be resolved by upgrading pip -# prior to installing the modules. More information on this error is found -# here: -# https://stackoverflow.com/questions/34819221/why-is-python-setup-py-saying-invalid-command-bdist-wheel-on-travis-ci - pip install --upgrade pip - # Install the packages pip install -e util/gem5art/artifact pip install -e util/gem5art/run diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh index 44ec8cf77e..07262b0563 100755 --- a/tests/jenkins/presubmit.sh +++ b/tests/jenkins/presubmit.sh @@ -37,7 +37,7 @@ set -e -DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest +DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-11:latest 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 46dd50efa2..bd42d4b209 100755 --- a/tests/nightly.sh +++ b/tests/nightly.sh @@ -69,7 +69,7 @@ build_target () { # compilation: https://gem5.atlassian.net/browse/GEM5-753 docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ "${gem5_root}" --memory="${docker_mem_limit}" --rm \ - gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest \ + gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest \ bash -c "scons build/${isa}/gem5.opt -j${compile_threads} \ --ignore-style || (rm -rf build && scons build/${isa}/gem5.opt \ -j${compile_threads} --ignore-style)" @@ -80,13 +80,13 @@ unit_test () { docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ "${gem5_root}" --memory="${docker_mem_limit}" --rm \ - gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest \ + gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest \ scons build/ALL/unittests.${build} -j${compile_threads} \ --ignore-style } # Ensure we have the latest docker images. -docker pull gcr.io/gem5-test/ubuntu-20.04_all-dependencies:latest +docker pull gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest # Try to build the ISA targets. build_target NULL @@ -104,7 +104,7 @@ unit_test debug # 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-20.04_all-dependencies:latest \ + gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest \ ./main.py run --length long -j${compile_threads} -t${run_threads} -vv # Unfortunately, due docker being unable run KVM, we do so separately. @@ -187,7 +187,7 @@ build_and_run_systemc () { 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-20.04_all-dependencies:latest bash -c "\ + gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest 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 \ diff --git a/tests/weekly.sh b/tests/weekly.sh index 373885fb37..3d8af297e5 100755 --- a/tests/weekly.sh +++ b/tests/weekly.sh @@ -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:latest \ + gcr.io/gem5-test/ubuntu-22.04_all-dependencies:latest \ ./main.py run --length very-long -j${threads} -t${threads} -vv mkdir -p tests/testing-results