From c47f1f819cd81efa3c7f9bc64cda30d337730210 Mon Sep 17 00:00:00 2001 From: RHE Date: Fri, 1 Dec 2017 16:42:57 +0100 Subject: create moon python unit test docker image Change-Id: I91c7103ca046a67c3cefadbd9ca6eca52cfbc0cf Signed-off-by: RHE --- moonv4/moon_utilities/README.md | 11 +++++++++++ moonv4/moon_utilities/tests/README.md | 12 ------------ moonv4/moon_utilities/tests/unit_python/Dockerfile | 7 ------- moonv4/moon_utilities/tests/unit_python/requirements.txt | 10 ---------- moonv4/moon_utilities/tests/unit_python/run_tests.sh | 8 -------- moonv4/templates/python_unit_test/Dockerfile | 8 ++++++++ moonv4/templates/python_unit_test/README.md | 8 ++++++++ moonv4/templates/python_unit_test/requirements.txt | 10 ++++++++++ moonv4/templates/python_unit_test/run_tests.sh | 7 +++++++ 9 files changed, 44 insertions(+), 37 deletions(-) delete mode 100644 moonv4/moon_utilities/tests/README.md delete mode 100644 moonv4/moon_utilities/tests/unit_python/Dockerfile delete mode 100644 moonv4/moon_utilities/tests/unit_python/requirements.txt delete mode 100644 moonv4/moon_utilities/tests/unit_python/run_tests.sh create mode 100644 moonv4/templates/python_unit_test/Dockerfile create mode 100644 moonv4/templates/python_unit_test/README.md create mode 100644 moonv4/templates/python_unit_test/requirements.txt create mode 100644 moonv4/templates/python_unit_test/run_tests.sh diff --git a/moonv4/moon_utilities/README.md b/moonv4/moon_utilities/README.md index b658a864..f5fa43ca 100644 --- a/moonv4/moon_utilities/README.md +++ b/moonv4/moon_utilities/README.md @@ -8,5 +8,16 @@ For any other information, refer to the parent project: moon_utilities is a common Python lib for other Moon Python packages +## Build +### Build Python Package +- `cd moon_utilities` +- `python3 setup.py sdist bdist_wheel` +### Push Python Package to PIP + +## Test +### Python Unit Test +- launch Docker for Python unit tests + - `cd moon_utilities` + - `docker run --rm --volume $(pwd):/data wukongsun/moon_python_unit_test:latest` diff --git a/moonv4/moon_utilities/tests/README.md b/moonv4/moon_utilities/tests/README.md deleted file mode 100644 index ddb4f55d..00000000 --- a/moonv4/moon_utilities/tests/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Tests - -## Python Unit Test for moon_utilities -- build the moon_utilities package -- launch Docker for Python unit tests - - `cd moon_utilities` - - `docker run --volume $(pwd):/data moon_utilities_test` -- upload moon_utilities to PIP - - - - diff --git a/moonv4/moon_utilities/tests/unit_python/Dockerfile b/moonv4/moon_utilities/tests/unit_python/Dockerfile deleted file mode 100644 index 681edcd7..00000000 --- a/moonv4/moon_utilities/tests/unit_python/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM python:3 - -RUN pip install pytest requests_mock requests --upgrade -ADD requirements.txt /root -RUN pip install -r /root/requirements.txt --upgrade - -CMD ["sh", "/data/tests/unit_python/run_tests.sh"] \ No newline at end of file diff --git a/moonv4/moon_utilities/tests/unit_python/requirements.txt b/moonv4/moon_utilities/tests/unit_python/requirements.txt deleted file mode 100644 index b611b008..00000000 --- a/moonv4/moon_utilities/tests/unit_python/requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ -kombu !=4.0.1,!=4.0.0 -oslo.messaging -oslo.config -oslo.log -vine -werkzeug -flask -requests -pytest -requests_mock \ No newline at end of file diff --git a/moonv4/moon_utilities/tests/unit_python/run_tests.sh b/moonv4/moon_utilities/tests/unit_python/run_tests.sh deleted file mode 100644 index 527e3dc4..00000000 --- a/moonv4/moon_utilities/tests/unit_python/run_tests.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -cd /data -pip3 install -r tests/unit_python/requirements.txt --upgrade -pip3 install . - -cd /data/tests/unit_python -pytest . diff --git a/moonv4/templates/python_unit_test/Dockerfile b/moonv4/templates/python_unit_test/Dockerfile new file mode 100644 index 00000000..b8fb5151 --- /dev/null +++ b/moonv4/templates/python_unit_test/Dockerfile @@ -0,0 +1,8 @@ +FROM python:3 + +RUN pip install pytest requests_mock requests --upgrade +ADD requirements.txt /root +RUN pip install -r /root/requirements.txt --upgrade + +ADD run_tests.sh /root +CMD ["sh", "/root/run_tests.sh"] \ No newline at end of file diff --git a/moonv4/templates/python_unit_test/README.md b/moonv4/templates/python_unit_test/README.md new file mode 100644 index 00000000..45d3a988 --- /dev/null +++ b/moonv4/templates/python_unit_test/README.md @@ -0,0 +1,8 @@ +# Python Unit Test Docker + +## Build +- `docker image build -t wukongsun/moon_python_unit_test .` + +## Push to DockerHub +- `docker login --username=wukongsun` +- `docker image push wukongsun/moon_python_unit_test` \ No newline at end of file diff --git a/moonv4/templates/python_unit_test/requirements.txt b/moonv4/templates/python_unit_test/requirements.txt new file mode 100644 index 00000000..b611b008 --- /dev/null +++ b/moonv4/templates/python_unit_test/requirements.txt @@ -0,0 +1,10 @@ +kombu !=4.0.1,!=4.0.0 +oslo.messaging +oslo.config +oslo.log +vine +werkzeug +flask +requests +pytest +requests_mock \ No newline at end of file diff --git a/moonv4/templates/python_unit_test/run_tests.sh b/moonv4/templates/python_unit_test/run_tests.sh new file mode 100644 index 00000000..68b75efa --- /dev/null +++ b/moonv4/templates/python_unit_test/run_tests.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +cd /data +pip3 install . + +cd /data/tests/unit_python +pytest . -- cgit 1.2.3-korg