Skip to content
Snippets Groups Projects
Commit 350c9880 authored by Corné Lukken's avatar Corné Lukken
Browse files

L2SS-951: Finishing touch for documentation

parent 271cd222
No related branches found
No related tags found
1 merge request!423L2SS-951: Disable site-packages and install pytango in tox
image: git.astron.nl:5000/lofar2.0/tango/lofar-device-base:l2ss-951 image: git.astron.nl:5000/lofar2.0/tango/lofar-device-base:latest
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
......
...@@ -31,6 +31,11 @@ services: ...@@ -31,6 +31,11 @@ services:
- --strict - --strict
- -- - --
- tox -e integration - tox -e integration
# TODO(L2SS-992): Update me to use sitepackages once L2SS-992 is fixed.
# sitepackages can be enabled for inside docker once pytango is installed from
# requirements.txt (To ensure reliable builds / all environments same versions)
# When run outside of docker, environment will be recreated if mismatched
# - tox --sitepackages -e integration
command: command:
# Allow for arguments to be passed that wil be put after the entrypoint # Allow for arguments to be passed that wil be put after the entrypoint
# tox is configured to take these arguments as integration test directory # tox is configured to take these arguments as integration test directory
......
...@@ -96,6 +96,10 @@ make stop elk ...@@ -96,6 +96,10 @@ make stop elk
# Run dummy integration test to install pytango in tox virtualenv without # Run dummy integration test to install pytango in tox virtualenv without
# the memory pressure of the ELK stack. # the memory pressure of the ELK stack.
# Alternatively this step can be avoided if we use:
# `tox --sitepackages -e integration` for the integration docker container,
# however, that does require creating a container specific integration job.
# TODO(L2SS-992): Remove me and above documentation
integration_test dummy integration_test dummy
make start elk make start elk
......
...@@ -6,7 +6,7 @@ skipsdist = True ...@@ -6,7 +6,7 @@ skipsdist = True
[testenv] [testenv]
usedevelop = True usedevelop = True
; Python and tox variables are used to access modules and binaries instead of ; Python and tox variables are used to access modules and binaries instead of
; directly. This is an artifact of having used sitepackages = true in the past. ; directly. This makes the setup robust for using sitepackages=True.
install_command = {envbindir}/pip3 install {opts} {packages} install_command = {envbindir}/pip3 install {opts} {packages}
passenv = HOME passenv = HOME
setenv = setenv =
...@@ -14,6 +14,8 @@ setenv = ...@@ -14,6 +14,8 @@ setenv =
PYTHONWARNINGS=default::DeprecationWarning PYTHONWARNINGS=default::DeprecationWarning
; Share the same envdir with as many jobs as possible due to extensive time it ; Share the same envdir with as many jobs as possible due to extensive time it
; takes to compile the pytango wheel, in addition to its large install size. ; takes to compile the pytango wheel, in addition to its large install size.
; should the environment change (such as the Python version) the environment
; will automatically be recreated.
envdir = {toxworkdir}/testenv envdir = {toxworkdir}/testenv
deps = deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
...@@ -41,8 +43,6 @@ envdir = {toxworkdir}/testenvpy39 ...@@ -41,8 +43,6 @@ envdir = {toxworkdir}/testenvpy39
envdir = {toxworkdir}/testenvpy310 envdir = {toxworkdir}/testenvpy310
[testenv:integration] [testenv:integration]
; Warning running integration tests will make changes to your docker system!
; These tests should only be run by the integration-test docker container.
allowlist_externals = echo allowlist_externals = echo
passenv = TANGO_HOST passenv = TANGO_HOST
setenv = setenv =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment