You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/09/26 05:47:30 UTC
[incubator-nuttx] branch master updated: ci: enable pytest on docker file
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 8b3a936588 ci: enable pytest on docker file
8b3a936588 is described below
commit 8b3a93658816c49d1e55c07c8bdd68c5bbdde688
Author: nietingting <ni...@xiaomi.com>
AuthorDate: Mon Sep 26 10:05:57 2022 +0800
ci: enable pytest on docker file
Signed-off-by: nietingting <ni...@xiaomi.com>
---
tools/ci/cibuild.sh | 7 ++++++-
tools/ci/docker/linux/Dockerfile | 7 +++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index 19ca20de09..68001c65ba 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -62,7 +62,12 @@ function python-tools {
PYTHONUSERBASE=${prebuilt}/pylocal
export PYTHONUSERBASE
add_path "${PYTHONUSERBASE}"/bin
- pip3 install pexpect
+ pip3 install pexpect==4.8.0
+ pip3 install pytest==6.2.5
+ pip3 install pytest-repeat==0.9.1
+ pip3 install pytest-json==0.4.0
+ pip3 install pytest-ordering==0.6
+ pip3 install pyserial==3.5
# MCUboot's tool for image signing and key management
if ! command -v imgtool &> /dev/null; then
diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index 54c0fd7adf..66850cb4f4 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -264,6 +264,13 @@ ENV PIP_NO_CACHE_DIR=0
RUN pip3 install setuptools wheel
# Install CodeChecker and use it to statically analyze the code.
RUN pip3 install CodeChecker
+# Install pytest
+RUN pip3 install pexpect==4.8.0
+RUN pip3 install pytest==6.2.5
+RUN pip3 install pytest-repeat==0.9.1
+RUN pip3 install pytest-json==0.4.0
+RUN pip3 install pytest-ordering==0.6
+RUN pip3 install pyserial==3.5
RUN mkdir /tools
WORKDIR /tools