Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade PostgreSQL test coverage #777

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ workflows:
matrix:
parameters:
crate-version: ["4.6.7", "4.2.7"]
timescale-version: ["2.3.0-pg13", "1.7.5-pg12"]
timescale-version: ["pg16.4-ts2.16.1-oss", "pg15.8-ts2.16.1-oss","pg14.13-ts2.16.1-oss", "pg13.16-ts2.15.3-oss", "pg12.20-ts2.11.2-oss"]
- test_reporter:
requires:
- build
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ backends. The following versions are currently covered in tests
(see [.circleci/config.yml](https://github.com/orchestracities/ngsi-timeseries-api/blob/master/.circleci/config.yml#L204)):

- Crate backend: Crate DB version `4.2.7` up to `4.6.7`
- Timescale backend: Postgres version `12` up to `13` +
Timescale extension `1.7.5` up to `2.3.0` + Postgis extension `2.5.*`.
- Timescale backend: Postgres version `12` up to `16` +
Timescale extension `2.11.2` up to `2.16.1` + Postgis extension `3.*`.

As regards caching feature, QuantumLeap has been tested with Redis `4.*` up
to `6.2.3`.
Expand Down
2 changes: 2 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ respectively for the query result as in e.g.
### Continuous Integration

- Fix for CircleCI image deprecation (#753)
- Change deprecated `timescaledb-postgis` image to `timescaledb-ha`
- Include test coverage for PostgreSQL 14, 15 and 16

### Documentation

Expand Down
2 changes: 1 addition & 1 deletion deps.env
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
export MONGO_VERSION=4.4
export ORION_VERSION=3.3.1
export CRATE_VERSION=4.6.7
export TIMESCALE_VERSION=2.3.0-pg13
export TIMESCALE_VERSION=pg13.16-ts2.15.3-oss

export REDIS_VERSION=6.2.3

Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- "8081:8081"

timescale:
image: timescale/timescaledb-postgis:${TIMESCALE_VERSION:-2.3.0-pg13}
image: timescale/timescaledb-ha:${TIMESCALE_VERSION:-pg13.16-ts2.15.3-oss}
ports:
- "5432:5432"
# Don't expose container port 5432 with the same number outside of the
Expand Down
2 changes: 1 addition & 1 deletion src/reporter/tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:

timescale:
image: timescale/timescaledb-postgis:${TIMESCALE_VERSION}
image: timescale/timescaledb-ha:${TIMESCALE_VERSION}
ports:
- "5432:5432"
networks:
Expand Down
2 changes: 1 addition & 1 deletion src/tests/benchmark/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
# - "4300:4300"

timescale:
image: timescale/timescaledb-postgis:${TIMESCALE_VERSION}
image: timescale/timescaledb-ha:${TIMESCALE_VERSION}
ports:
- "5432:5432"
environment:
Expand Down
2 changes: 1 addition & 1 deletion src/tests/docker-compose-bc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ services:
- LOGLEVEL=INFO

timescale:
image: timescale/timescaledb-postgis:${TIMESCALE_VERSION}
image: timescale/timescaledb-ha:${TIMESCALE_VERSION}
ports:
- "5432:5432"
# Don't expose container port 5432 with the same number outside of the
Expand Down
2 changes: 1 addition & 1 deletion src/tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
- LOGLEVEL=INFO

timescale:
image: timescale/timescaledb-postgis:${TIMESCALE_VERSION}
image: timescale/timescaledb-ha:${TIMESCALE_VERSION}
ports:
- "5432:5432"
# Don't expose container port 5432 with the same number outside of the
Expand Down
2 changes: 1 addition & 1 deletion src/wq/tests/benchmark/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
# - "4300:4300"

timescale:
image: timescale/timescaledb-postgis:${TIMESCALE_VERSION}
image: timescale/timescaledb-ha:${TIMESCALE_VERSION}
ports:
- "5432:5432"
environment:
Expand Down
2 changes: 1 addition & 1 deletion src/wq/tests/docker-compose.deployment-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
- RQ_MONITOR_REDIS_URL=redis://redis:6379

timescale:
image: timescale/timescaledb-postgis:${TIMESCALE_VERSION}
image: timescale/timescaledb-ha:${TIMESCALE_VERSION}
ports:
- "5432:5432"
networks:
Expand Down
2 changes: 1 addition & 1 deletion src/wq/tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- wqtests

timescale:
image: timescale/timescaledb-postgis:${TIMESCALE_VERSION}
image: timescale/timescaledb-ha:${TIMESCALE_VERSION}
ports:
- "5432:5432"
networks:
Expand Down
2 changes: 1 addition & 1 deletion timescale-container/test/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:

timescale:
image: timescale/timescaledb-postgis:${TIMESCALE_VERSION}
image: timescale/timescaledb-ha:${TIMESCALE_VERSION}
ports:
- "5432:5432"
networks:
Expand Down
2 changes: 1 addition & 1 deletion timescale-container/test/ql-db-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

DOCKER_IMG=timescale/timescaledb-postgis:${TIMESCALE_VERSION}
DOCKER_IMG=timescale/timescaledb-ha:${TIMESCALE_VERSION}
PORT=5432
PASS=abc123
DATA=ql-db-init/mtutenant.etdevice.csv
Expand Down
Loading