diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 428f143fa..11c3076a1 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -23,17 +23,6 @@ jobs: - name: yarn install run: | 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 run: | cd integration-tests @@ -72,24 +61,34 @@ jobs: env: POSTGRES_PASSWORD: Pwd2020Db options: '--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5' + ports: + - '15000:5432' mysql: image: 'mysql:8.0.18' env: MYSQL_ROOT_PASSWORD: Pwd2020Db + ports: + - '15004:3306' mssql: image: mcr.microsoft.com/mssql/server env: ACCEPT_EULA: 'Y' SA_PASSWORD: Pwd2020Db MSSQL_PID: Express + ports: + - '15002:1433' clickhouse: image: 'bitnami/clickhouse:24.8.4' env: CLICKHOUSE_ADMIN_PASSWORD: Pwd2020Db + ports: + - '15005:8123' oracle: image: 'gvenzl/oracle-xe:21-slim' env: ORACLE_PASSWORD: Pwd2020Db + ports: + - '15006:1521' mysql-ssh-login: image: 'ghcr.io/dbgate/mysql-ssh-login:latest' mysql-ssh-keyfile: diff --git a/integration-tests/tools.js b/integration-tests/tools.js index 96b68024d..b09a259bc 100644 --- a/integration-tests/tools.js +++ b/integration-tests/tools.js @@ -10,16 +10,21 @@ function randomDbName(dialect) { } function extractConnection(engine) { - const { connection } = engine; + return { + ...connection, + ...engine.local, + }; - if (process.env.LOCALTEST && engine.local) { - return { - ...connection, - ...engine.local, - }; - } + // const { connection } = engine; - return connection; + // if (process.env.LOCALTEST && engine.local) { + // return { + // ...connection, + // ...engine.local, + // }; + // } + + // return connection; } async function connect(engine, database) { diff --git a/workflow-templates/run-tests.yaml b/workflow-templates/run-tests.yaml index a15f6b9be..47f02a1f0 100644 --- a/workflow-templates/run-tests.yaml +++ b/workflow-templates/run-tests.yaml @@ -26,19 +26,19 @@ jobs: run: | yarn install - - name: Build packer dist for cypress - run: | - yarn prepare:packer + # - name: Build packer dist for cypress + # run: | + # yarn prepare:packer - - name: yarn install cypress - run: | - cd e2e-tests - yarn install + # - name: yarn install cypress + # run: | + # cd e2e-tests + # yarn install - - name: Run Cypress tests - run: | - cd e2e-tests - yarn test:ci + # - name: Run Cypress tests + # run: | + # cd e2e-tests + # yarn test:ci - name: Integration tests run: | @@ -88,11 +88,15 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 5 + ports: + - 15000:5432 mysql: image: mysql:8.0.18 env: MYSQL_ROOT_PASSWORD: Pwd2020Db + ports: + - 15004:3306 mssql: image: mcr.microsoft.com/mssql/server @@ -100,16 +104,23 @@ jobs: ACCEPT_EULA: Y SA_PASSWORD: Pwd2020Db MSSQL_PID: Express + ports: + - 15002:1433 clickhouse: image: bitnami/clickhouse:24.8.4 env: CLICKHOUSE_ADMIN_PASSWORD: Pwd2020Db + ports: + - 15005:8123 oracle: image: gvenzl/oracle-xe:21-slim env: ORACLE_PASSWORD: Pwd2020Db + ports: + - 15006:1521 + mysql-ssh-login: image: ghcr.io/dbgate/mysql-ssh-login:latest