diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 410d0beb5a8304bb3cc3c0bebb090ab90e8fdfa4..6ea39061a53517b12ec324f790ffffc1513db4c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -273,6 +273,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 faa2e0dc2339c47e1ad7c230d13558569bce4982..14db1df8fbbd0570e39707cae7c87ef1ae216683 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,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/docker-compose/object-storage.yml b/docker-compose/object-storage.yml index feebcee6b94deebecbec658ca6af7aaddad7af60..bf840d2d45daaedf79dcdec0bb0b130fc5aeafef 100644 --- a/docker-compose/object-storage.yml +++ b/docker-compose/object-storage.yml @@ -41,7 +41,11 @@ services: - ..:/opt/lofar/tango:rw entrypoint: '' command: > - sh -c "mc alias set object-storage http://object-storage:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD + sh -c "until [ \"$(curl -s -w '%{http_code}' -o /dev/null http://object-storage:9000/minio/health/live)\" -eq \"200\" ] + do + sleep 1 + done + mc alias set object-storage http://object-storage:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD mc mb --with-versioning object-storage/caltables mc cp --recursive /opt/lofar/tango/docker-compose/object-storage/caltables/ object-storage/caltables/" diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh index 6b3638f2b9900a27b97129e10e4e2acef72c9589..c968bc4bad321420bf9fc6b32fd96bc50ef2fe98 100755 --- a/sbin/run_integration_test.sh +++ b/sbin/run_integration_test.sh @@ -84,6 +84,10 @@ if [ -z "$LOFAR20_DIR" ]; then LOFAR20_DIR=$(readlink -f "${LOFAR20_DIR_RELATIVE}") fi +if [ -z "$TAG" ]; then + TAG="latest" +fi + [ -n "${no_build}" ] || make build dsconfig docker network rm station || true @@ -179,6 +183,7 @@ make start logstash http-json-schemas object-storage init-object-storage # Update the dsconfig # Do not remove `bash`, otherwise statement ignored by gitlab ci shell! docker pull -q "git.astron.nl:5000/lofar2.0/tango/dsconfig:$TAG" + bash "${LOFAR20_DIR}"/sbin/dsconfig.sh --load "${LOFAR20_DIR}"/CDB/stations/common.json bash "${LOFAR20_DIR}"/sbin/dsconfig.sh --update "${LOFAR20_DIR}"/CDB/stations/l0.json bash "${LOFAR20_DIR}"/sbin/dsconfig.sh --update "${LOFAR20_DIR}"/CDB/stations/l1.json 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/requirements.txt b/tangostationcontrol/requirements.txt index 69d5381d60426a69142d617984f2ef20650b1c54..93ff226d7284c58835529d2f51230b92aaa89271 100644 --- a/tangostationcontrol/requirements.txt +++ b/tangostationcontrol/requirements.txt @@ -12,7 +12,7 @@ pysnmp >= 0.1.7 # BSD h5py >= 3.1.0 # BSD jsonschema >= 4.18 # MIT docker >= 5.0.3 # Apache 2 -python-logstash-async >= 2.5.0 # MIT +python-logstash-async >= 2.5.0, != 2.7.1 # MIT - https://github.com/eht16/python-logstash-async/issues/88 python-casacore >= 3.3.1 # LGPLv3 etrs-itrs@git+https://github.com/brentjens/etrs-itrs # Apache 2 lofarantpos >= 0.5.0 # Apache 2 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.