[Skiboot] [PATCH] opal-ci: Fix broken fedora builds

[Dan Horák]

On Wed, 10 Jun 2020 12:44:54 +0530
Vasant Hegde <hegdevasant at linux.vnet.ibm.com> wrote:

> - Our device tree test cases are passing with fedora shipped `dtc`
>   command. Hence remove `dtc` build process.
> - Replace fedora30 with fedora32.

LGTM

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


		Dan

> 
> Signed-off-by: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
> ---
>  .travis.yml                                          | 2 +-
>  opal-ci/Dockerfile-docs                              | 2 +-
>  opal-ci/{Dockerfile-fedora30 => Dockerfile-fedora32} | 3 +--
>  opal-ci/build-fedora-rawhide.sh                      | 2 +-
>  opal-ci/{build-fedora30.sh => build-fedora32.sh}     | 6 ------
>  5 files changed, 4 insertions(+), 11 deletions(-)
>  rename opal-ci/{Dockerfile-fedora30 => Dockerfile-fedora32} (97%)
>  rename opal-ci/{build-fedora30.sh => build-fedora32.sh} (62%)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 8080889dd..250b100c7 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -12,7 +12,7 @@ env:
>      - RUN_ON_CONTAINER=ubuntu-18.04
>      - RUN_ON_CONTAINER=ubuntu-latest
>      - RUN_ON_CONTAINER=centos7
> -    - RUN_ON_CONTAINER=fedora30
> +    - RUN_ON_CONTAINER=fedora32
>      - RUN_ON_CONTAINER=fedora-rawhide
>      - RUN_ON_CONTAINER=debian-stretch
>      - RUN_ON_CONTAINER=debian-unstable
> diff --git a/opal-ci/Dockerfile-docs b/opal-ci/Dockerfile-docs
> index 900b2e80f..923955e83 120000
> --- a/opal-ci/Dockerfile-docs
> +++ b/opal-ci/Dockerfile-docs
> @@ -1 +1 @@
> -Dockerfile-fedora30
> \ No newline at end of file
> +Dockerfile-fedora32
> \ No newline at end of file
> diff --git a/opal-ci/Dockerfile-fedora30 b/opal-ci/Dockerfile-fedora32
> similarity index 97%
> rename from opal-ci/Dockerfile-fedora30
> rename to opal-ci/Dockerfile-fedora32
> index 17ba79bc9..5fbf46836 100644
> --- a/opal-ci/Dockerfile-fedora30
> +++ b/opal-ci/Dockerfile-fedora32
> @@ -1,4 +1,4 @@
> -FROM fedora:30
> +FROM fedora:32
>  RUN dnf -y update
>  RUN dnf -y install --allowerasing wget curl xterm gcc git xz make
> diffutils findutils expect valgrind valgrind-devel ccache dtc
> openssl-devel gcc-powerpc64-linux-gnu
>  # for building documentation
> @@ -10,4 +10,3 @@ RUN dnf -y install flex bison
>  RUN if [ `arch` = "x86_64" ]; then dnf -y install
> http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm;
> fi COPY . /build/ WORKDIR /build
> -
> diff --git a/opal-ci/build-fedora-rawhide.sh
> b/opal-ci/build-fedora-rawhide.sh index 6ea4b3ffa..329cdbecb 120000
> --- a/opal-ci/build-fedora-rawhide.sh
> +++ b/opal-ci/build-fedora-rawhide.sh
> @@ -1 +1 @@
> -build-fedora30.sh
> \ No newline at end of file
> +build-fedora32.sh
> \ No newline at end of file
> diff --git a/opal-ci/build-fedora30.sh b/opal-ci/build-fedora32.sh
> similarity index 62%
> rename from opal-ci/build-fedora30.sh
> rename to opal-ci/build-fedora32.sh
> index e1120b936..9042256d0 100755
> --- a/opal-ci/build-fedora30.sh
> +++ b/opal-ci/build-fedora32.sh
> @@ -7,12 +7,6 @@ set -vx
>  MAKE_J=$(grep -c processor /proc/cpuinfo)
>  export CROSS="ccache powerpc64-linux-gnu-"
>  
> -# There's a bug in dtc v1.4.7 packaged on fedora 28 that makes our
> device tree -# tests fail, so for the moment, build a slightly older
> DTC -git clone --depth=1 -b v1.4.4
> https://git.kernel.org/pub/scm/utils/dtc/dtc.git -(cd dtc; make -j$
> {MAKE_J}) -export PATH=`pwd`/dtc:$PATH
> -
>  make -j${MAKE_J} all
>  make -j${MAKE_J} check
>  (make clean; cd external/gard && CROSS= make -j${MAKE_J})
> -- 
> 2.26.2
> 
> _______________________________________________
> Skiboot mailing list
> Skiboot at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/skiboot