⚗️ CI: Use keep docker up in tests to improve test speed (ITISFoundation#3309)

Author: sanderegg

.github/workflows/ci-testing-deploy.yml

@@ -11,31 +11,23 @@ export DOCKER_IMAGE_TAG
 
 install() {
   bash ci/helpers/ensure_python_pip.bash
+  make devenv
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   pushd services/director-v2
-  pip3 install -r requirements/ci.txt
+  make install-ci
   popd
-  pip list -v
+  .venv/bin/pip list --verbose
   make pull-version || (make build tag-version)
   make info-images
 }
 
 test() {
-  echo "testing in services/director-v2/tests/integration/$1"
-  pytest \
-    --asyncio-mode=auto \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_service_director_v2 \
-    --durations=10 \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
-    --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --log-level=DEBUG \
-    --verbose \
-    -m "not heavy_load" \
-    "services/director-v2/tests/integration/$1"
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
+  pushd services/director-v2
+  make test-ci-integration test-subfolder="$1"
+  popd
 }
 
 clean_up() {

ci/github/integration-testing/director-v2.bash

@@ -10,31 +10,24 @@ export DOCKER_IMAGE_TAG
 
 install() {
   bash ci/helpers/ensure_python_pip.bash
+  make devenv
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   pushd packages/simcore-sdk
-  pip3 install -r requirements/ci.txt
+  make install-ci
   popd
-  pip list -v
+  .venv/bin/pip list --verbose
   # pull the test images if registry is set up, else build the images
   make pull-version || (make build tag-version)
   make info-images
 }
 
 test() {
-  pytest \
-    --asyncio-mode=auto \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_sdk \
-    --durations=10 \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
-    --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --log-level=DEBUG \
-    --verbose \
-    -m "not heavy_load" \
-    packages/simcore-sdk/tests/integration
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
+  pushd packages/simcore-sdk
+  make tests-integration-ci
+  popd
 }
 
 clean_up() {

ci/github/integration-testing/simcore-sdk.bash

@@ -11,29 +11,23 @@ export DOCKER_IMAGE_TAG
 
 install() {
   bash ci/helpers/ensure_python_pip.bash
+  make devenv
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   pushd services/web/server
-  pip3 install -r requirements/ci.txt
+  make install-ci
   popd
-  pip list -v
+  .venv/bin/pip list --verbose
   make pull-version || (make build tag-version)
   make info-images
 }
 
 test() {
-  pytest \
-    --asyncio-mode=auto \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_service_webserver \
-    --durations=10 \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
-    --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --verbose \
-    -m "not heavy_load" \
-    "services/web/server/tests/integration/$1"
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
+  pushd services/web/server
+  make test-ci-integration test-subfolder="$1"
+  popd
 }
 
 clean_up() {

ci/github/integration-testing/webserver.bash

@@ -7,27 +7,21 @@ IFS=$'\n\t'
 
 install() {
   bash ci/helpers/ensure_python_pip.bash
+  make devenv
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   pushd services/api-server
-  pip3 install -r requirements/ci.txt
+  make install-ci
   popd
-  pip list --verbose
+  .venv/bin/pip list --verbose
 }
 
 test() {
-  pytest \
-    --asyncio-mode=auto \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_service_api_server \
-    --durations=10 \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
-    --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --verbose \
-    -m "not heavy_load" \
-    services/api-server/tests/unit
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
+  pushd services/api-server
+  make test-ci-unit
+  popd
 }
 
 # Check if the function exists (bash specific)

ci/github/unit-testing/api-server.bash

@@ -7,27 +7,21 @@ IFS=$'\n\t'
 
 install() {
   bash ci/helpers/ensure_python_pip.bash
+  make devenv
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   pushd services/catalog
-  pip3 install -r requirements/ci.txt
+  make install-ci
   popd
-  pip list --verbose
+  .venv/bin/pip list --verbose
 }
 
 test() {
-  pytest \
-    --asyncio-mode=auto \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_service_catalog \
-    --durations=10 \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
-    --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --verbose \
-    -m "not heavy_load" \
-    services/catalog/tests/unit
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
+  pushd services/catalog
+  make test-ci-unit
+  popd
 }
 
 # Check if the function exists (bash specific)

ci/github/unit-testing/catalog.bash

@@ -7,27 +7,21 @@ IFS=$'\n\t'
 
 install() {
   bash ci/helpers/ensure_python_pip.bash
+  make devenv
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   pushd services/dask-sidecar
-  pip3 install -r requirements/ci.txt
+  make install-ci
   popd
-  pip list -v
+  .venv/bin/pip list --verbose
 }
 
 test() {
-  pytest \
-    --asyncio-mode=auto \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_service_dask_sidecar \
-    --durations=10 \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
-    --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --verbose \
-    -m "not heavy_load" \
-    services/dask-sidecar/tests/unit
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
+  pushd services/dask-sidecar
+  make test-ci-unit
+  popd
 }
 
 # Check if the function exists (bash specific)

ci/github/unit-testing/dask-sidecar.bash

@@ -7,28 +7,21 @@ IFS=$'\n\t'
 
 install() {
   bash ci/helpers/ensure_python_pip.bash
+  make devenv
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   pushd services/datcore-adapter
-  pip3 install -r requirements/ci.txt
+  make install-ci
   popd
-  pip list --verbose
+  .venv/bin/pip list --verbose
 }
 
 test() {
-  pytest \
-    --asyncio-mode=auto \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_service_datcore_adapter \
-    --durations=10 \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
-    --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --numprocesses=auto \
-    --verbose \
-    -m "not heavy_load" \
-    services/datcore-adapter/tests/unit
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
+  pushd services/datcore-adapter
+  make test-ci-unit pytest-parameters="--numprocesses=auto"
+  popd
 }
 
 # Check if the function exists (bash specific)

ci/github/unit-testing/datcore-adapter.bash

@@ -7,46 +7,24 @@ IFS=$'\n\t'
 
 install() {
   bash ci/helpers/ensure_python_pip.bash
+  make devenv
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   pushd services/director-v2
-  pip3 install -r requirements/ci.txt
+  make install-ci
   popd
-  pip list --verbose
+  .venv/bin/pip list --verbose
 }
 
 test() {
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   # tests without DB can be safely run in parallel
-  pytest \
-    --asyncio-mode=auto \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_service_director_v2 \
-    --durations=10 \
-    --ignore-glob=**/with_dbs/** \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
-    --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --numprocesses=auto \
-    --verbose \
-    -m "not heavy_load" \
-    services/director-v2/tests/unit
-
+  pushd services/director-v2
+  make test-ci-unit pytest-parameters="--numprocesses=auto --ignore-glob=**/with_dbs/**"
   # these tests cannot be run in parallel
-  pytest \
-    --asyncio-mode=auto \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_service_director_v2 \
-    --durations=10 \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
-    --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --verbose \
-    -m "not heavy_load" \
-    services/director-v2/tests/unit/with_dbs
+  make test-ci-unit test-subfolder=with_dbs
+  popd
 }
 
 # Check if the function exists (bash specific)

ci/github/unit-testing/director-v2.bash

@@ -14,32 +14,38 @@ install() {
   python -m ensurepip
 
   echo "INFO:" "$(pip --version)" "@" "$(command -v pip)"
-
   # NOTE: pip<22.0 for python 3.6
   pip3 install --upgrade \
     pip~=21.0 \
     wheel \
     setuptools
+  python3 -m venv .venv
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
   pushd services/director
   pip3 install -r requirements/ci.txt
   popd
-  pip list -v
+  .venv/bin/pip list --verbose
 }
 
 test() {
+  # shellcheck source=/dev/null
+  source .venv/bin/activate
+  pushd services/director
   pytest \
-    --color=yes \
-    --cov-append \
-    --cov-config=.coveragerc \
-    --cov-report=term-missing \
-    --cov-report=xml \
-    --cov=simcore_service_director \
-    --durations=10 \
-    --log-date-format="%Y-%m-%d %H:%M:%S" \
+		--color=yes \
+		--cov-append \
+		--cov-config=.coveragerc \
+		--cov-report=term-missing \
+		--cov-report=xml \
+		--cov=simcore_service_director \
+		--durations=10 \
+		--keep-docker-up \
+		--log-date-format="%Y-%m-%d %H:%M:%S" \
     --log-format="%(asctime)s %(levelname)s %(message)s" \
-    --verbose \
-    -m "not heavy_load" \
-    services/director/tests
+		--verbose \
+    tests/
+  popd
 }
 
 # Check if the function exists (bash specific)