diff --git a/.changeset/hot-buckets-dress.md b/.changeset/hot-buckets-dress.md new file mode 100644 index 00000000..03c8f932 --- /dev/null +++ b/.changeset/hot-buckets-dress.md @@ -0,0 +1,6 @@ +--- +"@hyperdx/api": patch +"@hyperdx/common-utils": patch +--- + +chore: Run integration tests on different ports diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 3e54f488..91bc0f84 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -32,7 +32,7 @@ services: - ./docker/clickhouse/local/users.xml:/etc/clickhouse-server/users.xml restart: on-failure ports: - - 8123:8123 # http api + - 18123:8123 # http api # - 9000:9000 # native networks: - internal @@ -40,7 +40,7 @@ services: image: mongo:5.0.32-focal command: --port 29999 ports: - - 29999:29999 + - 39999:29999 networks: - internal networks: diff --git a/packages/api/.env.test b/packages/api/.env.test index 6b8a60d3..0177d77f 100644 --- a/packages/api/.env.test +++ b/packages/api/.env.test @@ -1,12 +1,13 @@ -CLICKHOUSE_HOST=http://localhost:8123 +# Environment configuration for Integration tests, corresponding to ports defined in docker-compose.ci.yml +CLICKHOUSE_HOST=http://localhost:18123 CLICKHOUSE_PASSWORD=api CLICKHOUSE_USER=api RUN_SCHEDULED_TASKS_EXTERNALLY=true EXPRESS_SESSION_SECRET="hyperdx is cool 👋" FRONTEND_URL=http://app:8080 -MONGO_URI=mongodb://localhost:29999/hyperdx-test +MONGO_URI=mongodb://localhost:39999/hyperdx-test NODE_ENV=test -PORT=9000 -OPAMP_PORT=4320 +PORT=19000 # (API port) +OPAMP_PORT=14320 # Default to only logging warnings/errors. Adjust if you need more verbosity HYPERDX_LOG_LEVEL=warn \ No newline at end of file diff --git a/packages/common-utils/.env.test b/packages/common-utils/.env.test index 9d94fa69..cee3b1ad 100644 --- a/packages/common-utils/.env.test +++ b/packages/common-utils/.env.test @@ -1,4 +1,5 @@ -CLICKHOUSE_HOST=http://localhost:8123 +# Environment configuration for Integration tests, corresponding to ports defined in docker-compose.ci.yml +CLICKHOUSE_HOST=http://localhost:18123 CLICKHOUSE_PASSWORD= CLICKHOUSE_USER=default NODE_ENV=test