From 122834b59447c961769d9caa0417ec65d1339d9e Mon Sep 17 00:00:00 2001 From: suxxez Date: Sat, 21 Sep 2024 12:44:08 +0200 Subject: [PATCH 1/4] Add tests for PostgreSQL 14-16 and change deprecated TimescaleDB image --- .circleci/config.yml | 2 +- deps.env | 2 +- docker/docker-compose-common.yml | 2 +- src/reporter/tests/docker-compose.yml | 2 +- src/tests/benchmark/docker-compose.yml | 2 +- src/tests/docker-compose-bc.yml | 2 +- src/tests/docker-compose.yml | 2 +- src/wq/tests/benchmark/docker-compose.yml | 2 +- src/wq/tests/docker-compose.deployment-example.yml | 2 +- src/wq/tests/docker-compose.yml | 2 +- timescale-container/test/docker-compose.yml | 2 +- timescale-container/test/ql-db-setup.sh | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aef8f7d7..19ede7e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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-all", "pg15.8-ts2.16.1-all","pg14.13-ts2.16.1-all", "pg13.16-ts2.15.3-all", "pg12.20-ts2.11.2-all"] - test_reporter: requires: - build diff --git a/deps.env b/deps.env index 55151e8c..79436588 100644 --- a/deps.env +++ b/deps.env @@ -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-all export REDIS_VERSION=6.2.3 diff --git a/docker/docker-compose-common.yml b/docker/docker-compose-common.yml index e903e253..29802462 100644 --- a/docker/docker-compose-common.yml +++ b/docker/docker-compose-common.yml @@ -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-all} ports: - "5432:5432" # Don't expose container port 5432 with the same number outside of the diff --git a/src/reporter/tests/docker-compose.yml b/src/reporter/tests/docker-compose.yml index fbd8f50b..5d8b1b28 100644 --- a/src/reporter/tests/docker-compose.yml +++ b/src/reporter/tests/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: timescale: - image: timescale/timescaledb-postgis:${TIMESCALE_VERSION} + image: timescale/timescaledb-ha:${TIMESCALE_VERSION} ports: - "5432:5432" networks: diff --git a/src/tests/benchmark/docker-compose.yml b/src/tests/benchmark/docker-compose.yml index 4ddea312..dd6e0654 100644 --- a/src/tests/benchmark/docker-compose.yml +++ b/src/tests/benchmark/docker-compose.yml @@ -18,7 +18,7 @@ services: # - "4300:4300" timescale: - image: timescale/timescaledb-postgis:${TIMESCALE_VERSION} + image: timescale/timescaledb-ha:${TIMESCALE_VERSION} ports: - "5432:5432" environment: diff --git a/src/tests/docker-compose-bc.yml b/src/tests/docker-compose-bc.yml index bcfb0038..5edc18fa 100644 --- a/src/tests/docker-compose-bc.yml +++ b/src/tests/docker-compose-bc.yml @@ -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 diff --git a/src/tests/docker-compose.yml b/src/tests/docker-compose.yml index d1afda20..c6fd7ce9 100644 --- a/src/tests/docker-compose.yml +++ b/src/tests/docker-compose.yml @@ -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 diff --git a/src/wq/tests/benchmark/docker-compose.yml b/src/wq/tests/benchmark/docker-compose.yml index a7a79900..746d2c77 100644 --- a/src/wq/tests/benchmark/docker-compose.yml +++ b/src/wq/tests/benchmark/docker-compose.yml @@ -18,7 +18,7 @@ services: # - "4300:4300" timescale: - image: timescale/timescaledb-postgis:${TIMESCALE_VERSION} + image: timescale/timescaledb-ha:${TIMESCALE_VERSION} ports: - "5432:5432" environment: diff --git a/src/wq/tests/docker-compose.deployment-example.yml b/src/wq/tests/docker-compose.deployment-example.yml index a02bca85..c90637e0 100644 --- a/src/wq/tests/docker-compose.deployment-example.yml +++ b/src/wq/tests/docker-compose.deployment-example.yml @@ -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: diff --git a/src/wq/tests/docker-compose.yml b/src/wq/tests/docker-compose.yml index ec8477f2..3c6faa3a 100644 --- a/src/wq/tests/docker-compose.yml +++ b/src/wq/tests/docker-compose.yml @@ -10,7 +10,7 @@ services: - wqtests timescale: - image: timescale/timescaledb-postgis:${TIMESCALE_VERSION} + image: timescale/timescaledb-ha:${TIMESCALE_VERSION} ports: - "5432:5432" networks: diff --git a/timescale-container/test/docker-compose.yml b/timescale-container/test/docker-compose.yml index 1f8c6a3f..c81dc386 100644 --- a/timescale-container/test/docker-compose.yml +++ b/timescale-container/test/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: timescale: - image: timescale/timescaledb-postgis:${TIMESCALE_VERSION} + image: timescale/timescaledb-ha:${TIMESCALE_VERSION} ports: - "5432:5432" networks: diff --git a/timescale-container/test/ql-db-setup.sh b/timescale-container/test/ql-db-setup.sh index 5987f776..76426d8c 100755 --- a/timescale-container/test/ql-db-setup.sh +++ b/timescale-container/test/ql-db-setup.sh @@ -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 From df9e3a01e57bdf103d15ab54a7e44945d92a097e Mon Sep 17 00:00:00 2001 From: suxxez Date: Sun, 22 Sep 2024 12:12:03 +0200 Subject: [PATCH 2/4] Change timescale image tags to OSS --- .circleci/config.yml | 2 +- docker/docker-compose-common.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 19ede7e3..2c5ab3f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -217,7 +217,7 @@ workflows: matrix: parameters: crate-version: ["4.6.7", "4.2.7"] - timescale-version: ["pg16.4-ts2.16.1-all", "pg15.8-ts2.16.1-all","pg14.13-ts2.16.1-all", "pg13.16-ts2.15.3-all", "pg12.20-ts2.11.2-all"] + timescale-version: ["pg16.4-ts2.16.1-oss", "pg15.8-ts2.16.1","pg14.13-ts2.16.1-oss", "pg13.16-ts2.15.3-oss", "pg12.20-ts2.11.2-oss"] - test_reporter: requires: - build diff --git a/docker/docker-compose-common.yml b/docker/docker-compose-common.yml index 29802462..e5cd881f 100644 --- a/docker/docker-compose-common.yml +++ b/docker/docker-compose-common.yml @@ -50,7 +50,7 @@ services: - "8081:8081" timescale: - image: timescale/timescaledb-ha:${TIMESCALE_VERSION:-pg13.16-ts2.15.3-all} + 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 From a85d0bd91706154da2b7fced691d81e3497c12e0 Mon Sep 17 00:00:00 2001 From: suxxez Date: Sun, 22 Sep 2024 12:12:28 +0200 Subject: [PATCH 3/4] Update README and release notes --- README.md | 4 ++-- RELEASE_NOTES.md | 2 ++ deps.env | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1c85067e..6d5076b8 100644 --- a/README.md +++ b/README.md @@ -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`. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 42800a70..12d1947a 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -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 diff --git a/deps.env b/deps.env index 79436588..293765b1 100644 --- a/deps.env +++ b/deps.env @@ -3,7 +3,7 @@ export MONGO_VERSION=4.4 export ORION_VERSION=3.3.1 export CRATE_VERSION=4.6.7 -export TIMESCALE_VERSION=pg13.16-ts2.15.3-all +export TIMESCALE_VERSION=pg13.16-ts2.15.3-oss export REDIS_VERSION=6.2.3 From 6c27f52f2ff3399330364fdc60093a74143355c8 Mon Sep 17 00:00:00 2001 From: suxxez Date: Sun, 22 Sep 2024 12:13:38 +0200 Subject: [PATCH 4/4] Change PG15 image to OSS version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c5ab3f1..d52b8430 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -217,7 +217,7 @@ workflows: matrix: parameters: crate-version: ["4.6.7", "4.2.7"] - timescale-version: ["pg16.4-ts2.16.1-oss", "pg15.8-ts2.16.1","pg14.13-ts2.16.1-oss", "pg13.16-ts2.15.3-oss", "pg12.20-ts2.11.2-oss"] + 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