test(smoketest): use relative ext redirect URLs (backport #505) (#506)

test(smoketest): use relative ext redirect URLs (#505) (cherry picked from commit 9c7f623) Co-authored-by: Andrew Azores <[email protected]>
cryostatio · Jun 7, 2024 · ac6c271 · ac6c271
1 parent 819c451
commit ac6c271
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/compose/cryostat-grafana.yml b/compose/cryostat-grafana.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   cryostat:
     environment:
-      - GRAFANA_DASHBOARD_EXT_URL=${GRAFANA_DASHBOARD_EXT_URL:-http://localhost:3000/}
+      - GRAFANA_DASHBOARD_EXT_URL=${GRAFANA_DASHBOARD_EXT_URL:-/grafana/}
       - GRAFANA_DASHBOARD_URL=http://grafana:3000
   grafana:
     image: ${GRAFANA_DASHBOARD_IMAGE:-quay.io/cryostat/cryostat-grafana-dashboard:latest}

diff --git a/compose/s3-cloudserver.yml b/compose/s3-cloudserver.yml
@@ -7,7 +7,7 @@ services:
     environment:
       STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8000
-      STORAGE_EXT_URL: http://localhost:8080/storage/
+      STORAGE_EXT_URL: /storage/
       QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
       QUARKUS_S3_AWS_REGION: us-east-1
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static

diff --git a/compose/s3-localstack.yml b/compose/s3-localstack.yml
@@ -7,7 +7,7 @@ services:
     environment:
       STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:4566
-      STORAGE_EXT_URL: http://localhost:8080/storage/
+      STORAGE_EXT_URL: /storage/
       QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
       QUARKUS_S3_AWS_REGION: us-east-1
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static

diff --git a/compose/s3-minio.yml b/compose/s3-minio.yml
@@ -7,7 +7,7 @@ services:
     environment:
       STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:9000
-      STORAGE_EXT_URL: http://localhost:8080/storage/
+      STORAGE_EXT_URL: /storage/
       QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
       QUARKUS_S3_AWS_REGION: us-east-1
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static

diff --git a/compose/s3-seaweed.yml b/compose/s3-seaweed.yml
@@ -8,7 +8,7 @@ services:
       STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       CRYOSTAT_SERVICES_REPORTS_STORAGE_CACHE_NAME: archivedreports
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8333
-      STORAGE_EXT_URL: http://localhost:8080/storage/
+      STORAGE_EXT_URL: /storage/
       QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
       QUARKUS_S3_AWS_REGION: us-east-1
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static

diff --git a/smoketest.bash b/smoketest.bash
@@ -101,7 +101,6 @@ if [ "${USE_PROXY}" = "true" ]; then
     FILES+=("${DIR}/compose/auth_proxy.yml")
     CRYOSTAT_HTTP_HOST=auth
     CRYOSTAT_HTTP_PORT=8181
-    GRAFANA_DASHBOARD_EXT_URL=http://localhost:8080/grafana/
 else
     FILES+=("${DIR}/compose/no_proxy.yml")
     if [ "${s3}" != "none" ]; then