diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9ac77aa5ec97f22b96c152ed3a2a7d37d99c75b..4af993ee76ccde1aaecb0a2d7cb420b48b8ad691 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -279,6 +279,16 @@ integration_test_docker: paths: - log/ +multi_project_integration_test: + stage: integration-tests + variables: + TANGO_VERSION: $CI_COMMIT_SHA + COBALT_VERSION: main + LOFAR_VERSION: master + trigger: + project: lofar2.0/multi-project-integration + strategy: depend + wheel_packaging: stage: packaging rules: diff --git a/README.md b/README.md index 48c5c8a8ddc8ba17c77c3dee35224a9bd117b77d..904e96ee4334e230f97f00f77fe166015cb360f1 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,7 @@ Next change the version in the following places: # Release Notes +* 0.21.1 Implement multi project integration downstream pipeline * 0.21.0 Use radians instead of degrees when interpreting pointings * 0.20.5 Manage both polarisations in RCU_band_select_R(W), Antenna_Loss_R, and Frequency_Band_RW * 0.20.4 Collapse AbstractHierarchyDevice and AbstractHierarchy into one class diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION index 885415662ff8cd71c114c96b3cd70daaa329f04b..a67cebaf7ff61ccbf2741283f4341147d2fadae8 100644 --- a/tangostationcontrol/VERSION +++ b/tangostationcontrol/VERSION @@ -1 +1 @@ -0.21.0 +0.21.1 diff --git a/tangostationcontrol/tox.ini b/tangostationcontrol/tox.ini index 07cf254e6abc0b5428e8b4c8b2896d0fb1c0857d..788c2fb706ce9aa8057ba55793d14889f65cce14 100644 --- a/tangostationcontrol/tox.ini +++ b/tangostationcontrol/tox.ini @@ -27,7 +27,7 @@ commands_pre = {envpython} --version commands = {envpython} -m pytest --version - {envpython} -m pytest -v --log-level=DEBUG --forked test/{posargs} + {envpython} -m pytest -v --log-level=DEBUG --forked test/{posargs} ; We can't detect the current Python version for an environment dynamically ; so each Python version specific job needs its own envdir.