L2SS-451: Ignore submodule files in pipeline

Attempt to notify gitlab of dependencies

Depends-On: adae3f2d

docker-compose/integration-test.yml

@@ -15,6 +15,8 @@ services:
     container_name: ${CONTAINER_NAME_PREFIX}integration-test
     networks:
       - control
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:

docker-compose/itango.yml

@@ -21,6 +21,8 @@ services:
     container_name: ${CONTAINER_NAME_PREFIX}itango
     networks:
       - control
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
         - ${HOME}:/hosthome

docker-compose/lofar-device-base.yml

@@ -20,5 +20,9 @@ services:
         args:
             SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}lofar-device-base
+    # These parameters are just visual queues, you have to define them again
+    # in derived docker-compose files!
     networks:
       - control
+    extra_hosts:
+      - "host.docker.internal:host-gateway"

sbin/load_ConfigDb.sh

@@ -9,10 +9,10 @@ fi
 
 # copy file into container to read it from container, as the file's location
 # in the container won't be the same as on the host.
-docker cp "${file}" dsconfig:/tmp/dsconfig-load-settings.json || exit 1
+docker cp "${file}" "${CONTAINER_NAME_PREFIX}"dsconfig:/tmp/dsconfig-update-settings.json || exit 1
 
-# write settings
-docker exec -it dsconfig json2tango --write /tmp/dsconfig-load-settings.json
+# update settings, Do not change -i into -it this will break integration tests in gitlab ci!
+docker exec -i "${CONTAINER_NAME_PREFIX}"dsconfig json2tango --write /tmp/dsconfig-update-settings.json
 
 # somehow json2tango does not return 0 on success
 exit 0

sbin/run_integration_test.sh

@@ -12,13 +12,14 @@ fi
 # Start and stop sequence
 cd "$LOFAR20_DIR/docker-compose" || exit 1
 make stop device-sdp device-recv device-sst device-unb2 device-xst sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim
-make start databaseds dsconfig jupyter elk
+make start databaseds dsconfig elk
 
 # Give dsconfig and databaseds time to start
-sleep 15
+sleep 60
 
 # Update the dsconfig
-"${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/integration_ConfigDb.json
+# Do not remove `bash`, otherwise statement ignored by gitlab ci shell!
+bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/integration_ConfigDb.json
 
 cd "$LOFAR20_DIR/docker-compose" || exit 1
 make start sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim
@@ -28,12 +29,16 @@ sleep 5
 
 make start device-sdp device-recv device-sst device-unb2 device-xst
 
-# Give the devices time to start
-sleep 5
+# Give devices time to restart
+# TODO(Corne Lukken): Use a nicer more reliable mechanism
+sleep 60
 
 # Start the integration test
 cd "$LOFAR20_DIR/docker-compose" || exit 1
 make start integration-test
 
+# Give devices time to restart
+sleep 60
+
 # Run the integration test with the output displayed on stdout
-docker start -a integration-test
+docker start -a "${CONTAINER_NAME_PREFIX}"integration-test

sbin/update_ConfigDb.sh

@@ -9,10 +9,10 @@ fi
 
 # copy file into container to read it from container, as the file's location
 # in the container won't be the same as on the host.
-docker cp "${file}" dsconfig:/tmp/dsconfig-update-settings.json || exit 1
+docker cp "${file}" "${CONTAINER_NAME_PREFIX}"dsconfig:/tmp/dsconfig-update-settings.json || exit 1
 
-# update settings
-docker exec -it dsconfig json2tango --write --update /tmp/dsconfig-update-settings.json
+# update settings, Do not change -i into -it this will break integration tests in gitlab ci!
+docker exec -i "${CONTAINER_NAME_PREFIX}"dsconfig json2tango --write --update /tmp/dsconfig-update-settings.json
 
 # somehow json2tango does not return 0 on success
 exit 0