diff --git a/testplans/Makefile b/testplans/Makefile index b8d7dae5b..276003bce 100644 --- a/testplans/Makefile +++ b/testplans/Makefile @@ -6,15 +6,15 @@ 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:v11-lotus" -f "docker-images/Dockerfile.oni-buildbase" "docker-images" - docker build -t "iptestground/oni-runtime:v5" -f "docker-images/Dockerfile.oni-runtime" "docker-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" push-images: - docker push iptestground/oni-buildbase:v11-lotus - docker push iptestground/oni-runtime:v5 + docker push iptestground/oni-buildbase:v12-lotus + docker push iptestground/oni-runtime:v6 pull-images: - docker pull iptestground/oni-buildbase:v11-lotus - docker pull iptestground/oni-runtime:v5 + docker pull iptestground/oni-buildbase:v12-lotus + docker pull iptestground/oni-runtime:v6 .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 f29eb5896..92b86cfdc 100644 --- a/testplans/docker-images/Dockerfile.oni-buildbase +++ b/testplans/docker-images/Dockerfile.oni-buildbase @@ -1,10 +1,10 @@ -ARG GO_VERSION=1.14.2 +ARG GO_VERSION=1.15.5 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=1985275547f222e8c97a8ab70b5cc26bc1fa50b1 +ARG FILECOIN_FFI_COMMIT=1d9cb3e8ff53f51f9318fc57e5d00bc79bdc0128 ARG FFI_DIR=/extern/filecoin-ffi ARG BLST_COMMIT=1cbb16ed9580dcd3e9593b71221fcf2a048faaef diff --git a/testplans/docker-images/Dockerfile.oni-runtime b/testplans/docker-images/Dockerfile.oni-runtime index 9da469e0c..5ee460408 100644 --- a/testplans/docker-images/Dockerfile.oni-runtime +++ b/testplans/docker-images/Dockerfile.oni-runtime @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.14.2 +ARG GO_VERSION=1.15.5 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 68629ed7e..51f660feb 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.14.2 +ARG GO_VERSION=1.15.5 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 2048 /proof-parameters.json -ARG LOTUS_COMMIT=1a170e18a +ARG LOTUS_COMMIT=25070314c ## for debug purposes RUN apt update && apt install -y mesa-opencl-icd ocl-icd-opencl-dev gcc git bzr jq pkg-config 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 dca0355b0..08b22f7b9 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:v11-lotus" -runtime_image = "iptestground/oni-runtime:v5" +build_base_image = "iptestground/oni-buildbase:v12-lotus" +runtime_image = "iptestground/oni-runtime:v6" [runners."local:exec"] enabled = true