-
Notifications
You must be signed in to change notification settings - Fork 421
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pin libjpeg-turbo version, update upgrade script (#674)
* Pin libjpeg-turbo version, update upgrade script * fix params * update test scenarios * fix output format
- Loading branch information
Showing
18 changed files
with
202 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
version: '3.9' | ||
|
||
volumes: | ||
geoserver-data-dir: | ||
|
||
services: | ||
|
||
geoserver: | ||
image: 'kartoza/geoserver:${TAG:-manual-build}' | ||
restart: 'always' | ||
volumes: | ||
- geoserver-data-dir:/opt/geoserver/data_dir | ||
- ./tests:/tests | ||
environment: | ||
GEOSERVER_ADMIN_PASSWORD: myawesomegeoserver | ||
GEOSERVER_ADMIN_USER: admin | ||
INITIAL_MEMORY: 2G | ||
MAXIMUM_MEMORY: 4G | ||
SAMPLE_DATA: true | ||
TEST_CLASS: test_libjpeg.TestGeoServerTURBO | ||
ports: | ||
- "8080:8080" | ||
healthcheck: | ||
test: ["CMD-SHELL", "curl --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null -u $${GEOSERVER_ADMIN_USER}:$${GEOSERVER_ADMIN_PASSWORD} http://localhost:8080/geoserver/rest/about/version.xml"] | ||
interval: 1m30s | ||
timeout: 10s | ||
retries: 3 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
#!/usr/bin/env bash | ||
|
||
# exit immediately if test fails | ||
set -e | ||
|
||
source ../test-env.sh | ||
|
||
# Run service | ||
if [[ $(dpkg -l | grep "docker-compose") > /dev/null ]];then | ||
VERSION='docker-compose' | ||
else | ||
VERSION='docker compose' | ||
fi | ||
|
||
${VERSION} -f docker-compose.yml up -d | ||
|
||
if [[ -n "${PRINT_TEST_LOGS}" ]]; then | ||
${VERSION} -f docker-compose.yml logs -f & | ||
fi | ||
|
||
|
||
|
||
|
||
services=("geoserver") | ||
|
||
for service in "${services[@]}"; do | ||
|
||
# Execute tests | ||
test_url_availability http://localhost:8080/geoserver/rest/about/version.xml | ||
${VERSION} -f docker-compose.yml ps | ||
echo "Execute test for $service" | ||
${VERSION} -f docker-compose.yml exec $service /bin/bash /tests/test.sh | ||
|
||
done | ||
|
||
${VERSION} -f docker-compose.yml down -v |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -e | ||
|
||
source /scripts/env-data.sh | ||
|
||
# execute tests | ||
pushd /tests | ||
|
||
cat << EOF | ||
Settings used: | ||
GEOSERVER_ADMIN_PASSWORD: ${GEOSERVER_ADMIN_PASSWORD} | ||
GEOSERVER_ADMIN_USER: ${GEOSERVER_ADMIN_USER} | ||
EOF | ||
|
||
python3 -m unittest -v ${TEST_CLASS} |
Oops, something went wrong.