diff --git a/testplans/Makefile b/testplans/Makefile index a35f56639..410553b90 100644 --- a/testplans/Makefile +++ b/testplans/Makefile @@ -6,18 +6,18 @@ download-proofs: go run github.com/filecoin-project/go-paramfetch/paramfetch 2048 ./docker-images/proof-parameters.json build-images: - docker build -t "iptestground/oni-buildbase:v12-lotus" -f "docker-images/Dockerfile.oni-buildbase" "docker-images" - docker build -t "iptestground/oni-runtime:v6" -f "docker-images/Dockerfile.oni-runtime" "docker-images" - docker build -t "iptestground/oni-runtime:v7-debug" -f "docker-images/Dockerfile.oni-runtime-debug" "docker-images" + docker build -t "iptestground/oni-buildbase:v13-lotus" -f "docker-images/Dockerfile.oni-buildbase" "docker-images" + docker build -t "iptestground/oni-runtime:v7" -f "docker-images/Dockerfile.oni-runtime" "docker-images" + docker build -t "iptestground/oni-runtime:v8-debug" -f "docker-images/Dockerfile.oni-runtime-debug" "docker-images" push-images: - docker push iptestground/oni-buildbase:v12-lotus - docker push iptestground/oni-runtime:v6 - docker push iptestground/oni-runtime:v7-debug + docker push iptestground/oni-buildbase:v13-lotus + docker push iptestground/oni-runtime:v7 + docker push iptestground/oni-runtime:v8-debug pull-images: - docker pull iptestground/oni-buildbase:v12-lotus - docker pull iptestground/oni-runtime:v6 - docker pull iptestground/oni-runtime:v7-debug + docker pull iptestground/oni-buildbase:v13-lotus + docker pull iptestground/oni-runtime:v7 + docker pull iptestground/oni-runtime:v8-debug .PHONY: download-proofs build-images push-images pull-images diff --git a/testplans/docker-images/Dockerfile.oni-buildbase b/testplans/docker-images/Dockerfile.oni-buildbase index 92b86cfdc..012a27fc7 100644 --- a/testplans/docker-images/Dockerfile.oni-buildbase +++ b/testplans/docker-images/Dockerfile.oni-buildbase @@ -1,24 +1,16 @@ -ARG GO_VERSION=1.15.5 +ARG GO_VERSION=1.15.6 FROM golang:${GO_VERSION}-buster RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc git pkg-config bzr libhwloc-dev -ARG FILECOIN_FFI_COMMIT=1d9cb3e8ff53f51f9318fc57e5d00bc79bdc0128 +ARG FILECOIN_FFI_COMMIT=62f89f108a6a8fe9ad6ed52fb7ffbf8594d7ae5c ARG FFI_DIR=/extern/filecoin-ffi -ARG BLST_COMMIT=1cbb16ed9580dcd3e9593b71221fcf2a048faaef -ARG BLST_DIR=/extern/blst - RUN mkdir -p ${FFI_DIR} \ && git clone https://github.com/filecoin-project/filecoin-ffi.git ${FFI_DIR} \ && cd ${FFI_DIR} \ && git checkout ${FILECOIN_FFI_COMMIT} \ && make -RUN mkdir -p ${BLST_DIR} \ - && git clone https://github.com/supranational/blst.git ${BLST_DIR} \ - && cd ${BLST_DIR} \ - && git checkout ${BLST_COMMIT} - RUN ldconfig diff --git a/testplans/docker-images/Dockerfile.oni-runtime b/testplans/docker-images/Dockerfile.oni-runtime index 265c411f6..2ccb7337c 100644 --- a/testplans/docker-images/Dockerfile.oni-runtime +++ b/testplans/docker-images/Dockerfile.oni-runtime @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.15.5 +ARG GO_VERSION=1.15.6 FROM golang:${GO_VERSION}-buster as downloader diff --git a/testplans/docker-images/Dockerfile.oni-runtime-debug b/testplans/docker-images/Dockerfile.oni-runtime-debug index f6d29096c..a349a70da 100644 --- a/testplans/docker-images/Dockerfile.oni-runtime-debug +++ b/testplans/docker-images/Dockerfile.oni-runtime-debug @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.15.5 +ARG GO_VERSION=1.15.6 FROM golang:${GO_VERSION}-buster as downloader @@ -12,7 +12,7 @@ RUN go get github.com/filecoin-project/go-paramfetch/paramfetch COPY /proof-parameters.json / RUN paramfetch 8388608 /proof-parameters.json -ARG LOTUS_COMMIT=b13226bc2f8a0233b3beb9bd18ab266547bc29c7 +ARG LOTUS_COMMIT=b4ad2e5e93dc710d985eb9cf3ee04142efb47bf0 ## for debug purposes RUN apt update && apt install -y mesa-opencl-icd ocl-icd-opencl-dev gcc git bzr jq pkg-config libhwloc-dev curl && git clone https://github.com/filecoin-project/lotus.git && cd lotus/ && git checkout ${LOTUS_COMMIT} && make clean && make all && make install diff --git a/testplans/lotus-soup/manifest.toml b/testplans/lotus-soup/manifest.toml index 23b73e15a..8cc2f4caf 100644 --- a/testplans/lotus-soup/manifest.toml +++ b/testplans/lotus-soup/manifest.toml @@ -9,8 +9,8 @@ enabled = true [builders."docker:go"] enabled = true -build_base_image = "iptestground/oni-buildbase:v12-lotus" -runtime_image = "iptestground/oni-runtime:v7-debug" +build_base_image = "iptestground/oni-buildbase:v13-lotus" +runtime_image = "iptestground/oni-runtime:v8-debug" [runners."local:exec"] enabled = true