Skip to content
Snippets Groups Projects
Commit 0b3ba25d authored by Corné Lukken's avatar Corné Lukken
Browse files

L2SS-451: Remove artifacts of testing and update documentation in sh files

parent 3d6171ec
No related branches found
No related tags found
1 merge request!110L2SS-451: Integration test ci fix
#!/bin/bash
# writes the JSON dump to stdout, Do not change -i into -it incompatible with gitlab ci!
docker exec -i "${CONTAINER_NAME_PREFIX}"dsconfig python -m dsconfig.dump > "${1}"
docker exec -i "${CONTAINER_NAME_PREFIX}"dsconfig python -m dsconfig.
......@@ -9,7 +9,6 @@
# Pass a directory as first parameter to this script. This will
# then be used as LOFAR20_DIR. Otherwise this file's directory
# be used to determine the tango directory location.
ABSOLUTE_PATH=$(realpath $(dirname ${BASH_SOURCE}))
export LOFAR20_DIR=${1:-$(realpath ${ABSOLUTE_PATH}/../..)}
......@@ -25,14 +24,6 @@ else
unset CONTAINER_NAME_PREFIX
fi
# This needs to be modified for a development environment.
# Example: ~/lofar2.0/tango
# The current setting is for a production environment.
export TANGO_LOFAR_LOCAL_DIR=${LOFAR20_DIR}/
export TANGO_LOFAR_CONTAINER_DIR=/opt/lofar2.0/tango/
export TANGO_LOFAR_CONTAINER_MOUNT=${TANGO_LOFAR_LOCAL_DIR}:${TANGO_LOFAR_CONTAINER_DIR}:rw
# This needs to be modified for a development environment.
# In case you run multiple Docker networks on the same host in parallel, you need to specify a unique
# network name for each of them.
......
......@@ -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 "${TANGO_CONTAINER_ENV}" "${CONTAINER_NAME_PREFIX}"dsconfig json2tango --write "${file}"
# 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
......@@ -18,7 +18,7 @@ make start databaseds dsconfig elk
sleep 60
# Update the dsconfig
# Do not remove `bash`, otherwise statement ignored by gitlab ci!
# 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment