Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geosphere-mapserver
Manage
Activity
Members
Labels
Plan
Issues
6
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
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
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
cspp_geo
geosphere
geosphere-mapserver
Commits
c76075bd
Verified
Commit
c76075bd
authored
2 years ago
by
David Hoese
Browse files
Options
Downloads
Patches
Plain Diff
Cleanup test teardown
parent
386a73f3
No related branches found
No related tags found
1 merge request
!5
Add initial attempt at S3 geotiff reading
Pipeline
#40006
passed with stages
in 11 minutes and 56 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ci/test_mapserver_image.sh
+7
-6
7 additions, 6 deletions
ci/test_mapserver_image.sh
with
7 additions
and
6 deletions
ci/test_mapserver_image.sh
+
7
−
6
View file @
c76075bd
...
...
@@ -40,13 +40,14 @@ setup_test() {
}
teardown_test
()
{
kill_test_container
||
echo
"Could not kill test container"
kill_postgres
||
echo
"Could not kill postgres container"
kill_minio
||
echo
"Could not kill minio container"
kill_test_container
||
debug
"Could not kill test container"
kill_postgres
||
debug
"Could not kill postgres container"
kill_minio
||
debug
"Could not kill minio container"
if
[
-d
$base_tmp_dir
]
;
then
rm
-rf
$base_tmp_dir
docker run
--rm
--name
tmpremover
-v
${
base_tmp_dir
}
:/dst
${
image_url
}
:
${
image_tag
}
bash
-c
"chmod -R 777 /dst"
rm
-rf
$base_tmp_dir
||
debug
"Could not remove temporary directory:
${
base_tmp_dir
}
"
fi
docker network
rm
${
NETWORK_NAME
}
>
/dev/null
||
echo
"Could not remove docker network"
docker network
rm
${
NETWORK_NAME
}
>
/dev/null
||
debug
"Could not remove docker network"
}
graceful_exit
()
{
...
...
@@ -92,7 +93,7 @@ start_minio() {
base_dir
=
$1
base_minio_dir
=
"
$1
/minio_base"
mkdir
-p
"
${
base_minio_dir
}
"
docker run
-d
--rm
--network
${
NETWORK_NAME
}
-p
9000:9000
-p
9001:9001
--name
${
MINIO_SERVER_NAME
}
--user
$
{
UID
}
:
${
UID
}
-v
${
base_minio_dir
}
:/data minio/minio server /data
--console-address
":9001"
docker run
-d
--rm
--network
${
NETWORK_NAME
}
-p
9000:9000
-p
9001:9001
--name
${
MINIO_SERVER_NAME
}
--user
$
(
id
-u
)
:
$(
id
-g
)
-v
${
base_minio_dir
}
:/data minio/minio server /data
--console-address
":9001"
create_status
=
$?
debug
"Sleeping for 5 seconds for MinIO to start up..."
sleep
5
...
...
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