Merge branch 'L2SS-1341-migrate_tango2nomad' into L2SS-1340-deploy_monitoring_to_nomad

.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:

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

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/"
 

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

tangostationcontrol/VERSION

-0.21.0
+0.21.1

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