[Skiboot] [PATCH] opal-ci: Add Ubuntu20.04 support

[Dan Horák]

On Wed, 10 Jun 2020 15:22:17 +0530
Vasant Hegde <hegdevasant at linux.vnet.ibm.com> wrote:

> And drop Ubuntu 16.04.

not an Ubuntu expert, but still LGTM

Maybe you could mention switching to system qemu from a self-built one
in the commit message.

Reviewed-by: Dan Horák <dan at danny.cz>


		Dan
 
> Signed-off-by: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
> ---
>  .travis.yml                                                 | 2 +-
>  .../{Dockerfile-ubuntu-16.04 => Dockerfile-ubuntu-20.04}    | 6 +
> +---- opal-ci/{build-ubuntu-16.04.sh => build-ubuntu-20.04.sh}    | 2
> -- 3 files changed, 3 insertions(+), 7 deletions(-)
>  rename opal-ci/{Dockerfile-ubuntu-16.04 => Dockerfile-ubuntu-20.04}
> (72%) rename opal-ci/{build-ubuntu-16.04.sh => build-ubuntu-20.04.sh}
> (87%)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 250b100c7..f3a22c44f 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -8,8 +8,8 @@ cache: ccache
>  
>  env:
>      matrix:
> -    - RUN_ON_CONTAINER=ubuntu-16.04
>      - RUN_ON_CONTAINER=ubuntu-18.04
> +    - RUN_ON_CONTAINER=ubuntu-20.04
>      - RUN_ON_CONTAINER=ubuntu-latest
>      - RUN_ON_CONTAINER=centos7
>      - RUN_ON_CONTAINER=fedora32
> diff --git a/opal-ci/Dockerfile-ubuntu-16.04
> b/opal-ci/Dockerfile-ubuntu-20.04 similarity index 72%
> rename from opal-ci/Dockerfile-ubuntu-16.04
> rename to opal-ci/Dockerfile-ubuntu-20.04
> index c53bf03ce..277095166 100644
> --- a/opal-ci/Dockerfile-ubuntu-16.04
> +++ b/opal-ci/Dockerfile-ubuntu-20.04
> @@ -1,11 +1,9 @@
> -FROM ubuntu:16.04
> +FROM ubuntu:20.04
>  ENV DEBIAN_FRONTEND    noninteractive
>  RUN apt-get update -qq
>  RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get
> install -y gcc-powerpc64le-linux-gnu; fi -RUN apt-get update -qq &&
> apt-get install -y gcc ccache expect libssl-dev wget curl xterm
> device-tree-compiler build-essential gcc python g++ pkg-config
> libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6
> valgrind libtcl8.6 RUN apt-get update -qq && apt-get install -y
> gcc-arm-linux-gnueabi || true -RUN if [ `arch` = "x86_64" ]; then
> curl -L -O
> http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb;
> dpkg -i systemsim-p8_1.0-2_amd64.deb; fi +RUN apt-get update -qq &&
> apt-get install -y gcc ccache expect libssl-dev wget curl xterm
> device-tree-compiler build-essential gcc python g++ pkg-config
> libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6
> valgrind libtcl8.6 clang qemu-system-ppc RUN if [ `arch` =
> "x86_64" ]; then curl -O
> http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb;
> dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/
> WORKDIR /build - diff --git a/opal-ci/build-ubuntu-16.04.sh
> b/opal-ci/build-ubuntu-20.04.sh similarity index 87% rename from
> opal-ci/build-ubuntu-16.04.sh rename to opal-ci/build-ubuntu-20.04.sh
> index 39fb3f1c6..48eb825bf 100755
> --- a/opal-ci/build-ubuntu-16.04.sh
> +++ b/opal-ci/build-ubuntu-20.04.sh
> @@ -9,8 +9,6 @@ MAKE_J=$(grep -c processor /proc/cpuinfo)
>  export CROSS="ccache powerpc64le-linux-gnu-"
>  
>  make -j${MAKE_J} all
> -(cd opal-ci; ./build-qemu-powernv.sh)
> -export QEMU_BIN=$(pwd)/opal-ci/qemu/ppc64-softmmu/qemu-system-ppc64
>  make -j${MAKE_J} check
>  (make clean; cd external/gard && CROSS= make -j${MAKE_J})
>  # because some ppc64le versions don't have arm cross compiler
> -- 
> 2.26.2
> 
> _______________________________________________
> Skiboot mailing list
> Skiboot at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/skiboot