try to use runner local ports for CI tests

This commit is contained in:
SPRINX0\prochazka
2025-01-08 17:01:56 +01:00
parent 3179f2d72c
commit 2501cb170f
3 changed files with 45 additions and 30 deletions

View File

@@ -23,17 +23,6 @@ jobs:
- name: yarn install - name: yarn install
run: | run: |
yarn install yarn install
- name: Build packer dist for cypress
run: |
yarn prepare:packer
- name: yarn install cypress
run: |
cd e2e-tests
yarn install
- name: Run Cypress tests
run: |
cd e2e-tests
yarn test:ci
- name: Integration tests - name: Integration tests
run: | run: |
cd integration-tests cd integration-tests
@@ -72,24 +61,34 @@ jobs:
env: env:
POSTGRES_PASSWORD: Pwd2020Db POSTGRES_PASSWORD: Pwd2020Db
options: '--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5' options: '--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5'
ports:
- '15000:5432'
mysql: mysql:
image: 'mysql:8.0.18' image: 'mysql:8.0.18'
env: env:
MYSQL_ROOT_PASSWORD: Pwd2020Db MYSQL_ROOT_PASSWORD: Pwd2020Db
ports:
- '15004:3306'
mssql: mssql:
image: mcr.microsoft.com/mssql/server image: mcr.microsoft.com/mssql/server
env: env:
ACCEPT_EULA: 'Y' ACCEPT_EULA: 'Y'
SA_PASSWORD: Pwd2020Db SA_PASSWORD: Pwd2020Db
MSSQL_PID: Express MSSQL_PID: Express
ports:
- '15002:1433'
clickhouse: clickhouse:
image: 'bitnami/clickhouse:24.8.4' image: 'bitnami/clickhouse:24.8.4'
env: env:
CLICKHOUSE_ADMIN_PASSWORD: Pwd2020Db CLICKHOUSE_ADMIN_PASSWORD: Pwd2020Db
ports:
- '15005:8123'
oracle: oracle:
image: 'gvenzl/oracle-xe:21-slim' image: 'gvenzl/oracle-xe:21-slim'
env: env:
ORACLE_PASSWORD: Pwd2020Db ORACLE_PASSWORD: Pwd2020Db
ports:
- '15006:1521'
mysql-ssh-login: mysql-ssh-login:
image: 'ghcr.io/dbgate/mysql-ssh-login:latest' image: 'ghcr.io/dbgate/mysql-ssh-login:latest'
mysql-ssh-keyfile: mysql-ssh-keyfile:

View File

@@ -10,16 +10,21 @@ function randomDbName(dialect) {
} }
function extractConnection(engine) { function extractConnection(engine) {
const { connection } = engine;
if (process.env.LOCALTEST && engine.local) {
return { return {
...connection, ...connection,
...engine.local, ...engine.local,
}; };
}
return connection; // const { connection } = engine;
// if (process.env.LOCALTEST && engine.local) {
// return {
// ...connection,
// ...engine.local,
// };
// }
// return connection;
} }
async function connect(engine, database) { async function connect(engine, database) {

View File

@@ -26,19 +26,19 @@ jobs:
run: | run: |
yarn install yarn install
- name: Build packer dist for cypress # - name: Build packer dist for cypress
run: | # run: |
yarn prepare:packer # yarn prepare:packer
- name: yarn install cypress # - name: yarn install cypress
run: | # run: |
cd e2e-tests # cd e2e-tests
yarn install # yarn install
- name: Run Cypress tests # - name: Run Cypress tests
run: | # run: |
cd e2e-tests # cd e2e-tests
yarn test:ci # yarn test:ci
- name: Integration tests - name: Integration tests
run: | run: |
@@ -88,11 +88,15 @@ jobs:
--health-interval 10s --health-interval 10s
--health-timeout 5s --health-timeout 5s
--health-retries 5 --health-retries 5
ports:
- 15000:5432
mysql: mysql:
image: mysql:8.0.18 image: mysql:8.0.18
env: env:
MYSQL_ROOT_PASSWORD: Pwd2020Db MYSQL_ROOT_PASSWORD: Pwd2020Db
ports:
- 15004:3306
mssql: mssql:
image: mcr.microsoft.com/mssql/server image: mcr.microsoft.com/mssql/server
@@ -100,16 +104,23 @@ jobs:
ACCEPT_EULA: Y ACCEPT_EULA: Y
SA_PASSWORD: Pwd2020Db SA_PASSWORD: Pwd2020Db
MSSQL_PID: Express MSSQL_PID: Express
ports:
- 15002:1433
clickhouse: clickhouse:
image: bitnami/clickhouse:24.8.4 image: bitnami/clickhouse:24.8.4
env: env:
CLICKHOUSE_ADMIN_PASSWORD: Pwd2020Db CLICKHOUSE_ADMIN_PASSWORD: Pwd2020Db
ports:
- 15005:8123
oracle: oracle:
image: gvenzl/oracle-xe:21-slim image: gvenzl/oracle-xe:21-slim
env: env:
ORACLE_PASSWORD: Pwd2020Db ORACLE_PASSWORD: Pwd2020Db
ports:
- 15006:1521
mysql-ssh-login: mysql-ssh-login:
image: ghcr.io/dbgate/mysql-ssh-login:latest image: ghcr.io/dbgate/mysql-ssh-login:latest