From eca3770a93771dd121277d3bbc9cc4f69788f00f Mon Sep 17 00:00:00 2001 From: Ayush Shah Date: Tue, 1 Apr 2025 23:42:31 +0530 Subject: [PATCH] MINOR: Update Playwright integration test workflows to use 'playwright' deps (#20558) --- .../playwright-integration-tests-mysql.yml | 2 +- .../playwright-integration-tests-postgres.yml | 2 +- .github/workflows/playwright-mysql-e2e.yml | 2 +- .../workflows/playwright-postgresql-e2e.yml | 2 +- ingestion/setup.py | 18 ++++++++++++++++++ .../ingestion/models/custom_pydantic.py | 2 +- 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/playwright-integration-tests-mysql.yml b/.github/workflows/playwright-integration-tests-mysql.yml index 7e835f75cb4..e39fe63c109 100644 --- a/.github/workflows/playwright-integration-tests-mysql.yml +++ b/.github/workflows/playwright-integration-tests-mysql.yml @@ -84,7 +84,7 @@ jobs: with: python-version: "3.9" args: "-d mysql" - ingestion_dependency: "all" + ingestion_dependency: "playwright" - name: Run Playwright Integration Tests with browser ${{ matrix.browser-type }} env: E2E_REDSHIFT_HOST_PORT: ${{ secrets.E2E_REDSHIFT_HOST_PORT }} diff --git a/.github/workflows/playwright-integration-tests-postgres.yml b/.github/workflows/playwright-integration-tests-postgres.yml index f3bb11d2c79..7c42021ec9a 100644 --- a/.github/workflows/playwright-integration-tests-postgres.yml +++ b/.github/workflows/playwright-integration-tests-postgres.yml @@ -84,7 +84,7 @@ jobs: with: python-version: "3.9" args: "-d postgresql" - ingestion_dependency: "all" + ingestion_dependency: "playwright" - name: Run Playwright Integration Tests with browser ${{ matrix.browser-type }} env: E2E_REDSHIFT_HOST_PORT: ${{ secrets.E2E_REDSHIFT_HOST_PORT }} diff --git a/.github/workflows/playwright-mysql-e2e.yml b/.github/workflows/playwright-mysql-e2e.yml index 6322e0da60c..0d60fd96d53 100644 --- a/.github/workflows/playwright-mysql-e2e.yml +++ b/.github/workflows/playwright-mysql-e2e.yml @@ -96,7 +96,7 @@ jobs: with: python-version: '3.9' args: "-d mysql" - ingestion_dependency: "all" + ingestion_dependency: "playwright" - name: Install dependencies working-directory: openmetadata-ui/src/main/resources/ui/ diff --git a/.github/workflows/playwright-postgresql-e2e.yml b/.github/workflows/playwright-postgresql-e2e.yml index 85bc6be2fe0..f4065c72a3c 100644 --- a/.github/workflows/playwright-postgresql-e2e.yml +++ b/.github/workflows/playwright-postgresql-e2e.yml @@ -95,7 +95,7 @@ jobs: with: python-version: '3.9' args: "-d postgresql" - ingestion_dependency: "all" + ingestion_dependency: "playwright" - name: Install dependencies working-directory: openmetadata-ui/src/main/resources/ui/ diff --git a/ingestion/setup.py b/ingestion/setup.py index f477e3145bb..1ac38230df2 100644 --- a/ingestion/setup.py +++ b/ingestion/setup.py @@ -437,6 +437,23 @@ e2e_test = { "pytest-base-url", } +# Define playwright_dependencies as a set of packages required for Playwright tests +# These packages correspond to the ingestion connectors used in Playwright tests +playwright_dependencies = { + *plugins["mysql"], + *plugins["bigquery"], + *plugins["kafka"], + *plugins["mlflow"], + *plugins["snowflake"], + *plugins["superset"], + *plugins["postgres"], + *plugins["redshift"], + *plugins["airflow"], + *plugins["datalake-s3"], + *e2e_test + # Add other plugins as needed for Playwright tests +} + extended_testing = { "Faker", # For Sample Data Generation } @@ -466,6 +483,7 @@ setup( "data-insight": list(plugins["elasticsearch"]), **{plugin: list(dependencies) for (plugin, dependencies) in plugins.items()}, "all": filter_requirements({"airflow", "db2", "great-expectations"}), + "playwright": list(playwright_dependencies), "slim": filter_requirements( { "airflow", diff --git a/ingestion/src/metadata/ingestion/models/custom_pydantic.py b/ingestion/src/metadata/ingestion/models/custom_pydantic.py index 60f8025f146..f15d6859914 100644 --- a/ingestion/src/metadata/ingestion/models/custom_pydantic.py +++ b/ingestion/src/metadata/ingestion/models/custom_pydantic.py @@ -70,7 +70,7 @@ class BaseModel(PydanticBaseModel): raise exc return values - def model_dump_json( # pylint: disable=too-many-arguments + def model_dump_json( # pylint: disable=too-many-arguments,unused-argument self, *, mask_secrets: Optional[bool] = None,