From 84d61d604c8da9ad644ea9549b254b969fd09c21 Mon Sep 17 00:00:00 2001 From: Radoslaw Wicik Date: Thu, 3 Dec 2020 10:12:44 +0100 Subject: [PATCH] [EGD-3596] Add python test environment in docker `[docker]` Add python requirements for test with simulator Change is required to support running python test with simulator. --- .gitignore | 1 + config/bootstrap_config | 3 ++- config/download_assets | 6 ++++++ docker/Dockerfile.runner.in | 4 ++++ docker/docker-compose.yml | 26 +++++++++++++++++++++----- in_docker.sh | 2 +- 6 files changed, 35 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 65b0fde019928cde083e1e4345835d76ec6b45f0..e8a4544edc95c10cde7f0b27e7af835371fe8411 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ docker/Dockerfile docker/assets/actions* docker/assets/cmake* docker/assets/gcc-arm* +docker/assets/requirements* # vim temporary files *.swp diff --git a/config/bootstrap_config b/config/bootstrap_config index a4363eb73b04e3c479964e06c8135bb7ac138a67..a2b49df8fe82410add73a75acb96a06e6ac47f0e 100644 --- a/config/bootstrap_config +++ b/config/bootstrap_config @@ -47,6 +47,7 @@ INSTALL_PACKAGES=" tzdata \ vim \ wget \ - python3-magic + python3-magic \ + python3-pip " diff --git a/config/download_assets b/config/download_assets index 906b640a9bb75e25a4dfd31c2f84ff6a103f035f..378e43d6850ab8a115baf1c83f252bdd8a3df78d 100755 --- a/config/download_assets +++ b/config/download_assets @@ -37,8 +37,14 @@ function get_gh_runner() { wget --no-verbose --show-progress -c -O ${GH_RUNNER_PKG} ${GH_RUNNER_LINK} } +function getPythonReq() { + echo -e "\e[32m${FUNCNAME[0]}\e[0m" + cp ${SRC_ROOT}/test/requirements.txt $DEST_DIR +} + get_arm_toolchain get_cmake get_gh_runner +getPythonReq diff --git a/docker/Dockerfile.runner.in b/docker/Dockerfile.runner.in index 0ec2841e439917f0fa94089885b40c864cfecc3c..7819f695c01fa9d2efb725be1837473c8e935b73 100644 --- a/docker/Dockerfile.runner.in +++ b/docker/Dockerfile.runner.in @@ -17,6 +17,10 @@ RUN locale-gen pl_PL.UTF-8 \ dpkg-reconfigure --frontend noninteractive tzdata RUN mkdir -p /home/runner/app/settings +#add python packages +ADD assets/requirements.txt /home/docker/requirements.txt +RUN pip3 install -r /home/docker/requirements.txt + # ARM compiler ADD assets/@ARM_GCC_PKG@ /usr/local/ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b767f1e8971a8167f37de6e94132a373d1fe8368..0bb6e555374088ee13aa1621fd12895a0ec7a39f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,23 @@ version: '3' services: - gh-runner: - image: rwicik/pure_builder:1.0 - env_file: - - runner_settings - + gh-runner0: + image: wearemudita/mudita_os_builder:1.3 + environment: + WORKER_NAME: PureBuilder0 + env_file: + - runner_settings + entrypoint: /cmd.sh + gh-runner1: + image: wearemudita/mudita_os_builder:1.3 + environment: + WORKER_NAME: PureBuilder1 + env_file: + - runner_settings + entrypoint: /cmd.sh + gh-runner2: + image: wearemudita/mudita_os_builder:1.3 + environment: + WORKER_NAME: PureBuilder2 + env_file: + - runner_settings + entrypoint: /cmd.sh diff --git a/in_docker.sh b/in_docker.sh index d2055c7bbf316ce496d73469ea66b5e8b07dda3b..7e7d77d54bbaa7abedc33b878b8b5906d3ce4a1c 100755 --- a/in_docker.sh +++ b/in_docker.sh @@ -3,7 +3,7 @@ # For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md CONTAINER_NAME="wearemudita/mudita_os_builder" -CONTAINER_TAG="1.2" +CONTAINER_TAG="1.3" CONTAINER=${CONTAINER_NAME}:${CONTAINER_TAG} PURE_HOME=`pwd` STANDARD_OPTIONS="-v `pwd`:${PURE_HOME} --user \"$(id -u):$(id -g)\" --env HOME=${PURE_HOME} -t"