Post release clean up

- Use `timescale/timescaledb-ha` docker image - Remove `startup.upgrade-prerelease-extensions`
timescale · May 13, 2022 · 95d1269 · 95d1269
1 parent 749cf0d
commit 95d1269
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
@@ -2,8 +2,7 @@ version: '3.0'
 
 services:
   db:
-    #TODO (james): Replace hardcoded value
-    image: ghcr.io/timescale/dev_promscale_extension:develop-ts2-pg14
+    image: timescale/timescaledb-ha:pg14-latest
     ports:
       - 5432:5432/tcp
     environment:
@@ -33,9 +32,6 @@ services:
       PROMSCALE_TRACING_OTLP_SERVER_ADDRESS: ":9202"
       PROMSCALE_TELEMETRY_TRACE_JAEGER_ENDPOINT: "http://otel-collector:14268/api/traces"
       PROMSCALE_TELEMETRY_TRACE_SAMPLING_RATIO: "0.1"
-    # FIXME(paulfantom): remove before doing a release!
-    command:
-      - "-startup.upgrade-prerelease-extensions"
 
   otel-collector:
     platform: linux/amd64

diff --git a/docker-compose/high-availability/docker-compose.yaml b/docker-compose/high-availability/docker-compose.yaml
@@ -2,8 +2,7 @@ version: '3.0'
 
 services:
   db:
-    #TODO (james): Replace hardcoded value
-    image: ghcr.io/timescale/dev_promscale_extension:develop-ts2-pg14
+    image: timescale/timescaledb-ha:pg14-latest
     ports:
       - 5432:5432/tcp
     environment:
@@ -40,9 +39,6 @@ services:
       PROMSCALE_DB_PASSWORD: postgres
       PROMSCALE_WEB_TELEMETRY_PATH: /metrics-text
       PROMSCALE_DB_SSL_MODE: allow
-    # FIXME(paulfantom): remove before doing a release!
-    command:
-      - "-startup.upgrade-prerelease-extensions"
 
   promscale-connector2:
     image: timescale/promscale:latest
@@ -61,7 +57,4 @@ services:
       PROMSCALE_DB_PASSWORD: postgres
       PROMSCALE_WEB_TELEMETRY_PATH: /metrics-text
       PROMSCALE_DB_SSL_MODE: allow
-    # FIXME(paulfantom): remove before doing a release!
-    command:
-      - "-startup.upgrade-prerelease-extensions"
 
diff --git a/scripts/end_to_end_tests.sh b/scripts/end_to_end_tests.sh
@@ -86,7 +86,7 @@ PROMSCALE_DB_PASSWORD=postgres \
 PROMSCALE_DB_NAME=postgres \
 PROMSCALE_DB_SSL_MODE=disable \
 PROMSCALE_WEB_TELEMETRY_PATH=/metrics \
-./promscale -startup.only -startup.upgrade-prerelease-extensions
+./promscale -startup.only
 
 docker exec e2e-tsdb psql -U postgres -d postgres \
   -c "CREATE ROLE writer PASSWORD 'test' LOGIN" \