Merge branch 'L2SS-843' into 'master'

L2SS-843: Start CM and ES after archiver-timescale is up

Closes L2SS-843

See merge request !375

sbin/run_integration_test.sh

@@ -104,8 +104,8 @@ sleep 5
 
 # shellcheck disable=SC2086
 make start $DEVICES
-# Archive devices -> starting order is important
-make start archiver-timescale hdbppts-cm hdbppts-es
+# Archive devices: archive-timescale first
+make start archiver-timescale
 
 # Give devices time to restart
 # TODO(Corne Lukken): Use a nicer more reliable mechanism
@@ -115,6 +115,9 @@ sleep 60
 # shellcheck disable=SC2016
 echo '/usr/local/bin/wait-for-it.sh archiver-timescale:5432 --strict --timeout=300 -- true' | make run dsconfig bash -
 
+# Archive devices: Now that archiver-timescale is up we can start the CM and ES
+make start hdbppts-cm hdbppts-es
+
 # Start the integration test
 cd "$LOFAR20_DIR/docker-compose" || exit 1
 make up integration-test