Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
d4f33799
Commit
d4f33799
authored
3 years ago
by
Jan David Mol
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
devices/integration_test/README.md
+1
-2
1 addition, 2 deletions
devices/integration_test/README.md
devices/test/README.md
+1
-1
1 addition, 1 deletion
devices/test/README.md
sbin/run_integration_test.sh
+7
-5
7 additions, 5 deletions
sbin/run_integration_test.sh
with
9 additions
and
8 deletions
devices/integration_test/README.md
+
1
−
2
View file @
d4f33799
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
devices/test/README.md
+
1
−
1
View file @
d4f33799
...
@@ -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/lofar
2.0
/tango/devices/
cd
/opt/lofar/tango/devices/
tox
tox
```
```
...
...
This diff is collapsed.
Click to expand it.
sbin/run_integration_test.sh
+
7
−
5
View file @
d4f33799
#!/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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment