Geoserver e2e tests (#381)

## Overview

Minor adjustments to the `test-geoserver-secured-access` component for
the related e2e Geoserver tests

## Changes

- Adds test data and volume for `test-geoserver-secured-access`

## Related Issue / Discussion

- Related to other PR
[#125](Ouranosinc/PAVICS-e2e-workflow-tests#125)
on PAVICS-e2e-workflow-tests

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.33.2
+current_version = 1.33.3
 commit = True
 tag = False
 tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
 replace = {new_version}
 
 [bumpversion:file:RELEASE.txt]
-search = {current_version} 2023-09-27T13:25:37Z
+search = {current_version} 2023-09-29T17:58:48Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-09-27T13:25:37Z
+values = 2023-09-29T17:58:48Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -17,6 +17,13 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[1.33.3](https://github.com/bird-house/birdhouse-deploy/tree/1.33.3) (2023-09-29)
+------------------------------------------------------------------------------------------------------------------
+
+## Changes
+
+- Add test data and volume for `test-geoserver-secured-access`
+
 [1.33.2](https://github.com/bird-house/birdhouse-deploy/tree/1.33.2) (2023-09-27)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 1.33.2
+override APP_VERSION := 1.33.3
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

README.rst

@@ -14,13 +14,13 @@ for a full-fledged production platform.
     * - releases
       - | |latest-version| |commits-since|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.33.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.33.3.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.33.2...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.33.3...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.33.2-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.33.3-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.33.2
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.33.3
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

@@ -1 +1 @@
-1.33.2 2023-09-27T13:25:37Z
+1.33.3 2023-09-29T17:58:48Z

birdhouse/config/canarie-api/docker_configuration.py.template

@@ -109,8 +109,8 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '1.33.2',
-            'releaseTime': '2023-09-27T13:25:37Z',
+            'version': '1.33.3',
+            'releaseTime': '2023-09-29T17:58:48Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
@@ -142,8 +142,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '1.33.2',
-            'releaseTime': '2023-09-27T13:25:37Z',
+            'version': '1.33.3',
+            'releaseTime': '2023-09-29T17:58:48Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

birdhouse/optional-components/test-geoserver-secured-access/docker-compose-extra.yml

@@ -8,3 +8,6 @@ services:
   proxy:
     volumes:
       - ./optional-components/test-geoserver-secured-access/config/proxy/conf.d/test-geoserver-secured.conf:/etc/nginx/conf.extra-service.d/geoserver-secured-service/test-geoserver-secured.conf:ro
+  geoserver:
+    volumes:
+      - ./optional-components/test-geoserver-secured-access/test-data:/geoserver-test-data:ro

birdhouse/optional-components/test-geoserver-secured-access/test-data/Espace_Vert.prj

@@ -0,0 +1 @@
+PROJCS["NAD_1983_MTM_8",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",304800.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-73.5],PARAMETER["Scale_Factor",0.9999],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]

docs/source/conf.py

@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.33.2'
+version = '1.33.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.33.2'
+release = '1.33.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.