Skip to content
GitLab
Explore
Sign in
Register
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
0b3ba25d
Commit
0b3ba25d
authored
3 years ago
by
Corné Lukken
Browse files
Options
Downloads
Patches
Plain Diff
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
!110
L2SS-451: Integration test ci fix
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
bin/dump_ConfigDb.sh
+1
-1
1 addition, 1 deletion
bin/dump_ConfigDb.sh
bootstrap/etc/lofar20rc.sh
+0
-9
0 additions, 9 deletions
bootstrap/etc/lofar20rc.sh
sbin/load_ConfigDb.sh
+3
-3
3 additions, 3 deletions
sbin/load_ConfigDb.sh
sbin/run_integration_test.sh
+1
-1
1 addition, 1 deletion
sbin/run_integration_test.sh
with
5 additions
and
14 deletions
bin/dump_ConfigDb.sh
+
1
−
1
View file @
0b3ba25d
#!/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.
This diff is collapsed.
Click to expand it.
bootstrap/etc/lofar20rc.sh
+
0
−
9
View file @
0b3ba25d
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
sbin/load_ConfigDb.sh
+
3
−
3
View file @
0b3ba25d
...
...
@@ -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
#
wri
te settings
docker
exec
-i
t
"
${
TANGO_CONTAINER_ENV
}
"
"
${
CONTAINER_NAME_PREFIX
}
"
dsconfig json2tango
--write
"
${
file
}
"
#
upda
te 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
This diff is collapsed.
Click to expand it.
sbin/run_integration_test.sh
+
1
−
1
View file @
0b3ba25d
...
...
@@ -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
...
...
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