Skip to content

Commit

Permalink
Merge pull request #1522 from camptocamp/interrupted-upgrade-prod-2-9…
Browse files Browse the repository at this point in the history 
…-2.9.rc.11

Upgrade failed
  • Loading branch information
@sbrunner
sbrunner authored Nov 27, 2024
2 parents 3d97de9 + 6f3204f commit c19cd8d
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CONST_create_template/docker-compose-lib.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ services:
environment:
- PGOPTIONS
- MAPSERVER_CONFIG_FILE=/etc/mapserver/mapserver.conf
- MAPSERVER_BASE_PATH=/mapserv_proxy
- OGCAPI_HTML_TEMPLATE_DIRECTORY=/usr/local/share/mapserver/ogcapi/templates/html-bootstrap4/
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- AWS_DEFAULT_REGION
Expand Down
2 changes: 1 addition & 1 deletion CONST_create_template/env.default
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Default values for c2cgeoportal
GEOMAPFISH_VERSION=2.9.rc.10
GEOMAPFISH_VERSION=2.9.rc.11
GEOMAPFISH_MAIN_VERSION=2.9
GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
COMPOSE_PROJECT_NAME=geomapfish
Expand Down
39 changes: 37 additions & 2 deletions CONST_create_template/tests/test_app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,47 @@
("https://front/c2c/health_check", {"checker": "check_collector"}, 2),
("https://front/admin/layertree", {}, 10),
("https://front/admin/layertree/children", {}, 10),
("http://mapserver:8080/mapserv_proxy", {"SERVICE": "WMS", "REQUEST": "GetCapabilities"}, 60),
(
"http://mapserver:8080/mapserv_proxy/mapserver",
{"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
60,
),
(
"https://front/mapserv_proxy",
{"ogcserver": "source for image/png", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
{"ogcserver": "mapserver", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
60,
),
# (
# "http://qgisserver:8080/mapserv_proxy/",
# {"SERVICE": "WMS", "REQUEST": "GetCapabilities", "MAP": "/etc/qgisserver/project.qgs"},
# 60,
# ),
# (
# "https://front/mapserv_proxy",
# {"ogcserver": "qgisserver", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
# 60,
# ),
# OGC API - Features
# (
# "http://mapserver:8080/mapserv_proxy/mapserver/ogcapi/collections/osm_protected/items",
# {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
# 60,
# ),
# (
# "https://front/mapserv_proxy/mapserver/mapserver/ogcapi/collections/osm_open/items",
# {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
# 60,
# ),
# (
# "http://qgisserver:8080/mapserv_proxy/qgisserver/wfs3/collections/points/items",
# {"map": "/etc/qgisserver/project.qgs", "bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
# 60,
# ),
# (
# "https://front/mapserv_proxy/qgisserver/wfs3/collections/points/items",
# {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
# 60,
# ),
],
)
def test_url(url: str, params: dict[str, str], timeout: int) -> None:
Expand Down
2 changes: 2 additions & 0 deletions docker-compose-lib.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ services:
environment:
- PGOPTIONS
- MAPSERVER_CONFIG_FILE=/etc/mapserver/mapserver.conf
- MAPSERVER_BASE_PATH=/mapserv_proxy
- OGCAPI_HTML_TEMPLATE_DIRECTORY=/usr/local/share/mapserver/ogcapi/templates/html-bootstrap4/
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- AWS_DEFAULT_REGION
Expand Down
2 changes: 1 addition & 1 deletion env.default
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Default values for c2cgeoportal
GEOMAPFISH_VERSION=2.9.rc.10
GEOMAPFISH_VERSION=2.9.rc.11
GEOMAPFISH_MAIN_VERSION=2.9
GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
COMPOSE_PROJECT_NAME=geomapfish
Expand Down
1 change: 1 addition & 0 deletions mapserver/mapserver.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ CONFIG
# Map aliases
#
MAPS
MainPNG "/etc/mapserver/mapserver.map"
END

END
59 changes: 56 additions & 3 deletions tests/test_app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,70 @@
("https://front/c2c/health_check", {}, 2),
("https://front/c2c/health_check", {"max_level": "1"}, 2),
("https://front/c2c/health_check", {"checker": "check_collector"}, 2),
("http://mapserver:8080/mapserv_proxy", {"SERVICE": "WMS", "REQUEST": "GetCapabilities"}, 60),
# ("https://front/admin/layertree", {}, 10),
# ("https://front/admin/layertree/children", {}, 10),
(
"https://front/mapserv_proxy",
{"ogcserver": "Main PNG", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
"http://mapserver:8080/mapserv_proxy/MainPNG",
{"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
60,
),
(
"http://mapserver:8080/mapserv_proxy/",
{"MAP": "MainPNG", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
60,
),
# (
# "https://front/mapserv_proxy",
# {"ogcserver": "Main PNG", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
# 60,
# ),
# (
# "https://front/mapserv_proxy/Main+PNG",
# {"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
# 60,
# ),
# QGIS Server
(
"https://front/mapserv_proxy",
{"ogcserver": "QGIS server", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
60,
),
# (
# "https://front/mapserv_proxy/QGIS+server",
# {"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
# 60,
# ),
# (
# "http://qgisserver:8080/mapserv_proxy/",
# {"SERVICE": "WMS", "REQUEST": "GetCapabilities", "MAP": "/etc/qgisserver/project.qgs"},
# 60,
# ),
# (
# "https://front/mapserv_proxy",
# {"ogcserver": "qgisserver", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
# 60,
# ),
# OGC API - Features
# (
# "http://mapserver:8080/mapserv_proxy/mapserver/ogcapi/collections/osm_protected/items",
# {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
# 60,
# ),
# (
# "https://front/mapserv_proxy/mapserver/mapserver/ogcapi/collections/osm_open/items",
# {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
# 60,
# ),
# (
# "http://qgisserver:8080/mapserv_proxy/qgisserver/wfs3/collections/points/items",
# {"map": "/etc/qgisserver/project.qgs", "bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
# 60,
# ),
# (
# "https://front/mapserv_proxy/qgisserver/wfs3/collections/points/items",
# {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
# 60,
# ),
],
)
def test_url(url: str, params: dict[str, str], timeout: int) -> None:
Expand Down

0 comments on commit c19cd8d

Please sign in to comment.