derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util-docker,tests: Update supported/test OS to Ubuntu 22.04

Browse Source 
We add a Ubuntu 22.04 min- and all-dependency docker images. We also
update the compiler tests to compile with Ubuntu 22.04.

The Ubuntu 20.04 min-dependency image has been removed. It is no
longer required.

Change-Id: Iaf7f7e8598907beb16e154c971f327927f707cb9
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/64177
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
This commit is contained in:
Bobby R. Bruce
2022-10-04 17:21:08 -07:00
committed by Bobby Bruce
parent 555ed60eaa
commit 0ac27fd0bc
4 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/compiler-tests.sh
View File

@@ -28,11 +28,12 @@ images=("gcc-version-12"
"clang-version-8"
"clang-version-7"
"clang-version-6.0"
# The following checks our support for Ubuntu 18.04 and 20.04, for both our
# "minimum dependencies" and "all dependencies" docker images.
# The following checks our support for Ubuntu 18.04, 20.04, and 22.04.
"ubuntu-18.04_all-dependencies"
"ubuntu-20.04_all-dependencies"
"ubuntu-20.04_min-dependencies"
"ubuntu-22.04_all-dependencies"
# Here we test the minimum dependency scenario.
"ubuntu-22.04_min-dependencies"
)
# A subset of the above list: these images will build against every target,

11
util/dockerfiles/docker-compose.yaml
View File

@@ -31,11 +31,16 @@ services:
context: ubuntu-20.04_all-dependencies
dockerfile: Dockerfile
image: gcr.io/gem5-test/ubuntu-20.04_all-dependencies
ubuntu-20.04_min-dependencies:
ubuntu-22.04_all-dependencies:
build:
context: ubuntu-20.04_min-dependencies
context: ubuntu-22.04_all-dependencies
dockerfile: Dockerfile
image: gcr.io/gem5-test/ubuntu-20.04_min-dependencies
image: gcr.io/gem5-test/ubuntu-22.04_all-dependencies
ubuntu-22.04_min-dependencies:
build:
context: ubuntu-22.04_min-dependencies
dockerfile: Dockerfile
image: gcr.io/gem5-test/ubuntu-22.04_min-dependencies
gcc-7:
build:
context: ubuntu-18.04_gcc-version

36
util/dockerfiles/ubuntu-22.04_all-dependencies/Dockerfile Normal file
View File

@@ -0,0 +1,36 @@
# Copyright (c) 2022 The Regents of the University of California
# All Rights Reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met: redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer;
# redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution;
# neither the name of the copyright holders nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt -y update && apt -y upgrade && \
apt -y install build-essential git m4 scons zlib1g zlib1g-dev \
libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \
python3-dev doxygen libboost-all-dev libhdf5-serial-dev python3-pydot \
libpng-dev libelf-dev pkg-config pip python3-venv black
RUN pip install mypy pre-commit

6
util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile → util/dockerfiles/ubuntu-22.04_min-dependencies/Dockerfile
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2020 The Regents of the University of California
# Copyright (c) 2022 The Regents of the University of California
# All Rights Reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,8 +24,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM ubuntu:20.04
FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt -y update && apt -y upgrade && \
apt -y install build-essential m4 scons python3-dev python-is-python3
apt -y install build-essential m4 scons python3-dev