From 68a9951fb9ce212a5e5226d2eb9c7501af364fcc Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Fri, 23 Feb 2018 22:49:05 +0100 Subject: [PATCH] contrib: Add pytest-reruns into the builder image Should allow us to reduce the number of manual reruns, but may hide some flaky tests. Signed-off-by: Christian Decker --- contrib/Dockerfile.builder | 3 ++- contrib/Dockerfile.builder.i386 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/Dockerfile.builder b/contrib/Dockerfile.builder index 9cb430fb8..4b6f83552 100644 --- a/contrib/Dockerfile.builder +++ b/contrib/Dockerfile.builder @@ -35,4 +35,5 @@ RUN cd /tmp/ && \ mv /tmp/bitcoin-0.15.1/bin/bitcoin* /usr/local/bin/ && \ rm -rf bitcoin.tar.gz /tmp/bitcoin-0.15.1 -RUN pip3 install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 +RUN pip3 install --upgrade pip && \ + pip3 install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1 diff --git a/contrib/Dockerfile.builder.i386 b/contrib/Dockerfile.builder.i386 index 2df77d596..79ebfa00a 100644 --- a/contrib/Dockerfile.builder.i386 +++ b/contrib/Dockerfile.builder.i386 @@ -35,4 +35,5 @@ RUN cd /tmp/ && \ mv /tmp/bitcoin-0.15.1/bin/bitcoin* /usr/local/bin/ && \ rm -rf bitcoin.tar.gz /tmp/bitcoin-0.15.1 -RUN pip3 install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 +RUN pip3 install --upgrade pip && \ + pip3 install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1