Merge branch 'master' into L2SS-979-create-ccd-dashboard

sbin/run_integration_test.sh

@@ -32,7 +32,8 @@ function integration_test {
     echo "make restart ${restarts[@]} ..."
     make restart "${restarts[@]}"
   fi
-  sleep 10
+  #TODO(L2SS-988): Use healthcheck to wait for containers to become ready
+  sleep 30
   echo "make integration ${1} ..."
   make integration "${1}"
 }
@@ -105,6 +106,7 @@ integration_test dummy
 make start elk
 
 # Give elk time to start
+# TODO(L2SS-988): Use a nicer more reliable mechanism
 sleep 10
 
 # Update the dsconfig
@@ -128,7 +130,7 @@ make start $DEVICES
 make start archiver-timescale
 
 # Give devices time to restart
-# TODO(Corne Lukken): Use a nicer more reliable mechanism
+# TODO(L2SS-988): Use a nicer more reliable mechanism
 sleep 70
 
 # Give archiver-timescale time to start

tangostationcontrol/docs/docs-requirements.txt

+importlib-metadata<2.0.0,>=0.12;python_version<"3.8"
 sphinx>=4.3.2 # BSD
 sphinx-rtd-theme>=1.0.0 # MIT
\ No newline at end of file

tangostationcontrol/requirements.txt

@@ -2,6 +2,7 @@
 # order of appearance. Changing the order has an impact on the overall
 # integration process, which may cause wedges in the gate later.
 
+importlib-metadata<2.0.0,>=0.12;python_version<"3.8"
 lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.6.0
 numpy
 mock

tangostationcontrol/test-requirements.txt

@@ -2,6 +2,7 @@
 # order of appearance. Changing the order has an impact on the overall
 # integration process, which may cause wedges in the gate later.
 
+importlib-metadata<2.0.0,>=0.12;python_version<"3.8"
 asynctest>=0.13.0 # Apache-2.0
 bandit>=1.6.0 # Apache-2.0
 virtualenv>=20.16.0 # MIT