From cd176832845e57f76af4224094ba955a9be928d4 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 7 Nov 2024 15:53:56 +0000 Subject: [PATCH] Remove logging and tmpfs changes, weren't that impactful. --- .github/workflows/budibase_ci.yml | 1 - packages/server/src/integrations/tests/utils/mariadb.ts | 1 - packages/server/src/integrations/tests/utils/mssql.ts | 1 - packages/server/src/integrations/tests/utils/mysql.ts | 1 - packages/server/src/integrations/tests/utils/oracle.ts | 3 --- packages/server/src/integrations/tests/utils/postgres.ts | 1 - 6 files changed, 8 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index fc0f3a0187..9028dc416d 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -197,7 +197,6 @@ jobs: - name: Test server env: - DEBUG: testcontainers* DATASOURCE: ${{ matrix.datasource }} run: | AFFECTED=$(yarn --silent nx show projects --affected -t test --base=${{ env.NX_BASE_BRANCH }} -p @budibase/server) diff --git a/packages/server/src/integrations/tests/utils/mariadb.ts b/packages/server/src/integrations/tests/utils/mariadb.ts index ff339496e9..8f797a5776 100644 --- a/packages/server/src/integrations/tests/utils/mariadb.ts +++ b/packages/server/src/integrations/tests/utils/mariadb.ts @@ -30,7 +30,6 @@ export async function getDatasource(): Promise { ports = startContainer( new GenericContainer(MARIADB_IMAGE) .withExposedPorts(3306) - .withTmpFs({ "/var/lib/mysql": "rw" }) .withEnvironment({ MARIADB_ROOT_PASSWORD: "password" }) .withWaitStrategy(new MariaDBWaitStrategy().withStartupTimeout(20000)) ) diff --git a/packages/server/src/integrations/tests/utils/mssql.ts b/packages/server/src/integrations/tests/utils/mssql.ts index eca4d6d684..28a7928f3b 100644 --- a/packages/server/src/integrations/tests/utils/mssql.ts +++ b/packages/server/src/integrations/tests/utils/mssql.ts @@ -21,7 +21,6 @@ export async function getDatasource(): Promise { // version in production. MSSQL_PID: "Developer", }) - .withTmpFs({ "/var/opt/mssql": "rw" }) .withWaitStrategy( Wait.forSuccessfulCommand( "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Password_123 -q 'SELECT 1'" diff --git a/packages/server/src/integrations/tests/utils/mysql.ts b/packages/server/src/integrations/tests/utils/mysql.ts index ec665243c4..5fa4e4f46d 100644 --- a/packages/server/src/integrations/tests/utils/mysql.ts +++ b/packages/server/src/integrations/tests/utils/mysql.ts @@ -34,7 +34,6 @@ export async function getDatasource(): Promise { new GenericContainer(MYSQL_IMAGE) .withExposedPorts(3306) .withEnvironment({ MYSQL_ROOT_PASSWORD: "password" }) - .withTmpFs({ "/var/lib/mysql": "rw" }) .withWaitStrategy(new MySQLWaitStrategy().withStartupTimeout(20000)) ) } diff --git a/packages/server/src/integrations/tests/utils/oracle.ts b/packages/server/src/integrations/tests/utils/oracle.ts index 71247400c6..8e7fd6c900 100644 --- a/packages/server/src/integrations/tests/utils/oracle.ts +++ b/packages/server/src/integrations/tests/utils/oracle.ts @@ -23,9 +23,6 @@ export async function getDatasource(): Promise { .withEnvironment({ ORACLE_PASSWORD: password, }) - .withTmpFs({ - "/opt/oracle/oradata/FREEPDB1": "", - }) .withWaitStrategy( Wait.forLogMessage("DATABASE IS READY TO USE!").withStartupTimeout( 20000 diff --git a/packages/server/src/integrations/tests/utils/postgres.ts b/packages/server/src/integrations/tests/utils/postgres.ts index f5dafb8e5c..cc77226ff6 100644 --- a/packages/server/src/integrations/tests/utils/postgres.ts +++ b/packages/server/src/integrations/tests/utils/postgres.ts @@ -13,7 +13,6 @@ export async function getDatasource(): Promise { new GenericContainer(POSTGRES_IMAGE) .withExposedPorts(5432) .withEnvironment({ POSTGRES_PASSWORD: "password" }) - .withTmpFs({ "/var/lib/postgresql/data": "rw" }) .withWaitStrategy( Wait.forSuccessfulCommand( "pg_isready -h localhost -p 5432"