From 954d02e1b92f70c84e69359a1de7431178854108 Mon Sep 17 00:00:00 2001 From: Wilfried Roset Date: Thu, 18 Mar 2021 18:16:57 +0100 Subject: [PATCH] Update accepted PostgreSQL version As promscale support timescaledb extension up to 2.99.0 which is compatible with PostgreSQL 13, let's make promscale compatible with it. See: 94d8c0a Signed-off-by: Wilfried Roset --- .github/workflows/e2e.yml | 6 +++--- .github/workflows/go.yml | 6 +++--- pkg/version/version.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 4e71ec0eee..8a17c9e3bd 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -30,8 +30,8 @@ jobs: if: ${{ failure() }} run: docker logs e2e-tsdb - - name: Test against TimescaleDB 2.0 - run: ./scripts/end_to_end_tests.sh timescale/timescaledb:2.0.0-rc2-pg12 + - name: Test against TimescaleDB 2.1 + run: ./scripts/end_to_end_tests.sh timescale/timescaledb:2.1.0-pg13 shell: bash - name: Print debug logs @@ -39,7 +39,7 @@ jobs: run: docker logs e2e-tsdb - name: Test against TimescaleDB 2.0 with Promscale extension - run: ./scripts/end_to_end_tests.sh timescaledev/promscale-extension:2.0.0-rc2-pg12 + run: ./scripts/end_to_end_tests.sh timescaledev/promscale-extension:latest-ts2-pg12 shell: bash - name: Print debug logs diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 665202dab1..0e22158585 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -100,9 +100,9 @@ jobs: test-setups: - {name: "W/O Promscale Extension", ext: false, tsdb: true, tsdb2: false, multi: false} - {name: "W/O TimescaleDB Extension", ext: false, tsdb: false, tsdb2: false, multi: false} - - {name: "on TimescaleDB 2.0", ext: true, tsdb: true, tsdb2: true, multi: false} - - {name: "on TimescaleDB 2.0 W/O Promscale Extension", ext: false, tsdb: true, tsdb2: true, multi: false} - - {name: "on TimescaleDB 2.0 multinode", ext: true, tsdb: true, tsdb2: true, multi: true} + - {name: "on TimescaleDB 2.1", ext: true, tsdb: true, tsdb2: true, multi: false} + - {name: "on TimescaleDB 2.1 W/O Promscale Extension", ext: false, tsdb: true, tsdb2: true, multi: false} + - {name: "on TimescaleDB 2.1 multinode", ext: true, tsdb: true, tsdb2: true, multi: true} steps: - name: Set up Go 1.14 diff --git a/pkg/version/version.go b/pkg/version/version.go index 420b547f67..0f0ac5f613 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -42,7 +42,7 @@ var ( EarliestUpgradeTestVersion = "0.1.0" EarliestUpgradeTestVersionMultinode = "0.1.4" //0.1.4 earliest version that supports tsdb 2.0 - PgVersionNumRange = "=12.x" // Corresponds to range within pg 12.0 to pg 12.99 + PgVersionNumRange = ">=12.x <14.x" // Corresponds to range within pg 12.0 to pg 13.99 pgAcceptedVersionsRange = semver.MustParseRange(PgVersionNumRange) TimescaleVersionRangeString = struct {