diff options
author | Cédric Le Goater <clg@kaod.org> | 2021-11-08 18:45:43 +0100 |
---|---|---|
committer | Cédric Le Goater <clg@kaod.org> | 2021-11-09 20:22:58 +0100 |
commit | 638cf7345012fdf20beadb173a75f8e9f462f220 (patch) | |
tree | d10b2e6d02e7278e3004bcdc0052ee2e125cebd3 | |
parent | 3f2b43293fc7a8ce1df6a7e366d331dff5a43d85 (diff) | |
download | skiboot-638cf7345012fdf20beadb173a75f8e9f462f220.zip skiboot-638cf7345012fdf20beadb173a75f8e9f462f220.tar.gz skiboot-638cf7345012fdf20beadb173a75f8e9f462f220.tar.bz2 |
CI: Update runs with P10 mambo
Signed-off-by: Cédric Le Goater <clg@kaod.org>
-rw-r--r-- | opal-ci/Dockerfile-centos8 | 1 | ||||
-rw-r--r-- | opal-ci/Dockerfile-fedora-rawhide | 1 | ||||
-rw-r--r-- | opal-ci/Dockerfile-fedora33 | 1 | ||||
-rw-r--r-- | opal-ci/Dockerfile-fedora34 | 1 | ||||
-rw-r--r-- | opal-ci/Dockerfile-fedora35 | 1 | ||||
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-20.04 | 1 | ||||
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-rolling | 1 | ||||
-rwxr-xr-x | test/hello_world/run_mambo_p10_hello_world.sh | 2 |
8 files changed, 8 insertions, 1 deletions
diff --git a/opal-ci/Dockerfile-centos8 b/opal-ci/Dockerfile-centos8 index c5897ed..d7cec74 100644 --- a/opal-ci/Dockerfile-centos8 +++ b/opal-ci/Dockerfile-centos8 @@ -11,5 +11,6 @@ RUN curl -L https://github.com/dgibson/dtc/archive/refs/tags/v1.6.1.tar.gz|tar x RUN (cd dtc-1.6.1; make PREFIX=/usr/local install) 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.el7.x86_64.rpm; yum install -y systemsim-p8-1.0-2.el7.x86_64.rpm; fi 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 +RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide index 0c9d239..bf95904 100644 --- a/opal-ci/Dockerfile-fedora-rawhide +++ b/opal-ci/Dockerfile-fedora-rawhide @@ -4,5 +4,6 @@ RUN dnf -y install gcc-powerpc64-linux-gnu mbedtls-devel # below packages are for building dtc 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 +RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-fedora33 b/opal-ci/Dockerfile-fedora33 index e5b582c..cbe32fa 100644 --- a/opal-ci/Dockerfile-fedora33 +++ b/opal-ci/Dockerfile-fedora33 @@ -4,5 +4,6 @@ RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils find # for building documentation and the coverage report RUN dnf -y install python-pip lcov 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 +RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-fedora34 b/opal-ci/Dockerfile-fedora34 index 9c976a4..6cc1241 100644 --- a/opal-ci/Dockerfile-fedora34 +++ b/opal-ci/Dockerfile-fedora34 @@ -4,5 +4,6 @@ RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils find # for building documentation and the coverage report RUN dnf -y install python-pip lcov 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 +RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-fedora35 b/opal-ci/Dockerfile-fedora35 index 5373bac..5c4d803 100644 --- a/opal-ci/Dockerfile-fedora35 +++ b/opal-ci/Dockerfile-fedora35 @@ -4,6 +4,7 @@ RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils find # for building documentation and the coverage report RUN dnf -y install python-pip lcov 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 +RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; 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/Dockerfile-ubuntu-20.04 b/opal-ci/Dockerfile-ubuntu-20.04 index a574139..3e481ca 100644 --- a/opal-ci/Dockerfile-ubuntu-20.04 +++ b/opal-ci/Dockerfile-ubuntu-20.04 @@ -5,5 +5,6 @@ RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gn RUN apt-get install -y gcc-arm-linux-gnueabi || true 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 libmbedtls-dev 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 +RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-ubuntu-rolling b/opal-ci/Dockerfile-ubuntu-rolling index 77c81e5..4a60fb3 100644 --- a/opal-ci/Dockerfile-ubuntu-rolling +++ b/opal-ci/Dockerfile-ubuntu-rolling @@ -5,6 +5,7 @@ RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gn 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 +RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_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/test/hello_world/run_mambo_p10_hello_world.sh b/test/hello_world/run_mambo_p10_hello_world.sh index 4ce5449..b492a9f 100755 --- a/test/hello_world/run_mambo_p10_hello_world.sh +++ b/test/hello_world/run_mambo_p10_hello_world.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ -z "$P10MAMBO_PATH" ]; then - P10MAMBO_PATH=/opt/ibm/systemsim-p10-1.1-0 + P10MAMBO_PATH=/opt/ibm/systemsim-p10-1.2-1 fi if [ -z "$P10MAMBO_BINARY" ]; then |