diff options
author | Frederic Barrat <fbarrat@linux.ibm.com> | 2021-11-05 18:26:17 +0100 |
---|---|---|
committer | Cédric Le Goater <clg@kaod.org> | 2021-11-05 18:51:12 +0100 |
commit | 9a54e6a49748c96b2f4d696535e3d66a8eb20414 (patch) | |
tree | e25868db05d62a15712d0e7cf8d06d58f4490834 | |
parent | c437b2150c8eeeee01c774ba1115457d7ef2ef89 (diff) | |
download | skiboot-9a54e6a49748c96b2f4d696535e3d66a8eb20414.zip skiboot-9a54e6a49748c96b2f4d696535e3d66a8eb20414.tar.gz skiboot-9a54e6a49748c96b2f4d696535e3d66a8eb20414.tar.bz2 |
CI: Rename ubuntu-latest to ubuntu-rolling
In the docker world, ubuntu-latest is the latest LTS release, 20.04 as
of this writing. ubuntu-rolling is the latest (non-devel) release,
which is 21.10 as of this writing. So rename our CI files accordingly
to avoid confusion.
Also ubuntu 21.10 ships with a recent enough qemu-system-ppc package
so we can now run a simple qemu boot test for powernv. The Docker file
fetches a kernel image from the op-build repo on github.
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-latest | 9 | ||||
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-rolling | 10 | ||||
l--------- | opal-ci/build-debian-unstable.sh | 2 | ||||
-rwxr-xr-x | opal-ci/build-ubuntu-rolling.sh (renamed from opal-ci/build-ubuntu-latest.sh) | 8 |
4 files changed, 14 insertions, 15 deletions
diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest deleted file mode 100644 index b89fde5..0000000 --- a/opal-ci/Dockerfile-ubuntu-latest +++ /dev/null @@ -1,9 +0,0 @@ -FROM ubuntu:rolling -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 qemu-system-ppc libmbedtls-dev -RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true -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/Dockerfile-ubuntu-rolling b/opal-ci/Dockerfile-ubuntu-rolling new file mode 100644 index 0000000..77c81e5 --- /dev/null +++ b/opal-ci/Dockerfile-ubuntu-rolling @@ -0,0 +1,10 @@ +FROM ubuntu:rolling +ENV DEBIAN_FRONTEND noninteractive +RUN apt-get update -qq +RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi +RUN 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 qemu-system-ppc libmbedtls-dev +RUN apt-get install -y gcc-arm-linux-gnueabi || true +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 +RUN curl -L -O https://github.com/open-power/op-build/releases/download/v2.7/zImage.epapr diff --git a/opal-ci/build-debian-unstable.sh b/opal-ci/build-debian-unstable.sh index 03f753e..43f2ff8 120000 --- a/opal-ci/build-debian-unstable.sh +++ b/opal-ci/build-debian-unstable.sh @@ -1 +1 @@ -build-ubuntu-latest.sh
\ No newline at end of file +build-ubuntu-rolling.sh
\ No newline at end of file diff --git a/opal-ci/build-ubuntu-latest.sh b/opal-ci/build-ubuntu-rolling.sh index ea27bba..d3ffdac 100755 --- a/opal-ci/build-ubuntu-latest.sh +++ b/opal-ci/build-ubuntu-rolling.sh @@ -17,11 +17,9 @@ make -j${MAKE_J} check CROSS_COMPILE=arm-linux-gnueabi- make || { echo "ARM build failed"; exit 1; } ) (cd external/pflash; make clean && make distclean && make) -# GCOV build disabled for GCC 8.2 -# https://github.com/open-power/skiboot/issues/206 -# make clean -# SKIBOOT_GCOV=1 make -j${MAKE_J} -# SKIBOOT_GCOV=1 make -j${MAKE_J} check +make clean +SKIBOOT_GCOV=1 make -j${MAKE_J} +SKIBOOT_GCOV=1 make -j${MAKE_J} check make clean rm -rf builddir |