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.

Sign up for GitHub

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

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

Merged
merged 2 commits into from
Jun 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41364c9
test(smoketest): use relative ext redirect URLs
andrewazores Jun 7, 2024
57d3d31
fixup! test(smoketest): use relative ext redirect URLs
andrewazores Jun 7, 2024
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 compose/cryostat-grafana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion compose/s3-cloudserver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compose/s3-localstack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compose/s3-minio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compose/s3-seaweed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion smoketest.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading