L2SS-677: don't try to load bootstrap jsons when starting dsconfig, but do so...

L2SS-677: don't try to load bootstrap jsons when starting dsconfig, but do so explicitly when we want those settigns

docker-compose/Makefile

@@ -181,6 +181,7 @@ bootstrap: pull build # first start, initialise from scratch
 	$(MAKE) start dsconfig # boot up containers to load configurations
 	sleep 5 # wait for dsconfig container to come up
 	../sbin/update_ConfigDb.sh ../CDB/LOFAR_ConfigDb.json # load default configuration
+	../sbin/update_ConfigDb.sh ../CDB/tango-archiver-data/archiver-devices.json # load default archive configuration
 	../sbin/update_ConfigDb.sh ../CDB/stations/simulators_ConfigDb.json # by default, use simulators
 
 start: up ## start a service (usage: make start <servicename>)

docker-compose/tango.yml

@@ -80,12 +80,10 @@ services:
       - TANGO_HOST=${TANGO_HOST}
     command: >
       sh -c "wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
-             json2tango -w -a -u /tango-archiver-data/archiver-devices.json &&
              sleep infinity"
     volumes:
       - ..:/opt/lofar/tango:rw
       - ${HOME}:/hosthome
-      - ../CDB/tango-archiver-data:/tango-archiver-data
     logging:
       driver: syslog
       options:

sbin/run_integration_test.sh

@@ -43,6 +43,7 @@ make start elk
 # Update the dsconfig
 # Do not remove `bash`, otherwise statement ignored by gitlab ci shell!
 bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/LOFAR_ConfigDb.json
+bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/tango-archiver-data/archiver-devices.json
 bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/stations/simulators_ConfigDb.json
 bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/stations/dummy_positions_ConfigDb.json
 
@@ -87,7 +88,7 @@ fi
 # Dump logs of important devices
 for device in $DEVICES
 do
-  docker logs "${device}" >& "${ARTIFACT_DIR}/${device}.log"
+  docker logs "${CONTAINER_NAME_PREFIX}${device}" >& "${ARTIFACT_DIR}/${device}.log"
 done
 
 exit $TEST_RESULT