Skip to content
Snippets Groups Projects
Commit d4f33799 authored by Jan David Mol's avatar Jan David Mol
Browse files

L2SS-394: Remove need for LOFAR20_DIR from integration test.

parent 3ac6ab81
No related branches found
No related tags found
No related merge requests found
...@@ -16,8 +16,7 @@ are running and are in the required state. ...@@ -16,8 +16,7 @@ are running and are in the required state.
**Warning running these tests will make changes to your CDB database config!** **Warning running these tests will make changes to your CDB database config!**
```shell ```shell
source bootstrap/etc/lofar20rc.sh sbin/run_integration_test.sh
$LOFAR20_DIR/sbin/run_integration_test.sh
``` ```
## Limitations ## Limitations
......
...@@ -120,7 +120,7 @@ Docker container. A simple interactive Docker exec is enough to access them: ...@@ -120,7 +120,7 @@ Docker container. A simple interactive Docker exec is enough to access them:
```sh ```sh
docker exec -it device-sdp /bin/bash docker exec -it device-sdp /bin/bash
cd /opt/lofar2.0/tango/devices/ cd /opt/lofar/tango/devices/
tox tox
``` ```
......
#!/bin/bash #!/bin/bash
# Check if lofar20rc.sh is sourced and environment variables are set. if [ -z "$LOFA20_DIR"]; then
if [ -z "$LOFAR20_DIR" ]; then # We assume we aren't in the PATH, so we can derive our path.
echo "\$LOFAR20_DIR is unset or blank, is lofar20rc.sh sourced correctly?" # We need our parent directory.
exit 1 LOFAR20_DIR_RELATIVE=`dirname "$0"`/..
# As an absolute path
LOFAR20_DIR=`readlink -f "${LOFAR20_DIR_RELATIVE}"`
fi fi
# Start and stop sequence # Start and stop sequence
...@@ -15,7 +18,6 @@ make start databaseds dsconfig jupyter elk ...@@ -15,7 +18,6 @@ make start databaseds dsconfig jupyter elk
sleep 15 sleep 15
# Update the dsconfig # Update the dsconfig
cd "$TANGO_LOFAR_LOCAL_DIR" || exit 1
sbin/update_ConfigDb.sh CDB/integration_ConfigDb.json sbin/update_ConfigDb.sh CDB/integration_ConfigDb.json
cd "$LOFAR20_DIR/docker-compose" || exit 1 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