Merge branch 'main' into show-display-name-explore-tree

open-metadata · Sep 21, 2024 · a36b041 · a36b041
2 parents 14134c2 + e008a0d
commit a36b041
Show file tree

Hide file tree

Showing 237 changed files with 8,518 additions and 3,690 deletions.
diff --git a/.github/workflows/playwright-mysql-e2e-skip.yml b/.github/workflows/playwright-mysql-e2e-skip.yml
@@ -21,7 +21,6 @@ on:
       - opened
       - synchronize
       - reopened
-      - ready_for_review
     paths:
       - openmetadata-docs/**
       - .github/**

diff --git a/.github/workflows/playwright-mysql-e2e.yml b/.github/workflows/playwright-mysql-e2e.yml
@@ -21,7 +21,6 @@ on:
       - opened
       - synchronize
       - reopened
-      - ready_for_review
     paths-ignore:
       - openmetadata-docs/**
       - .github/**
@@ -96,7 +95,7 @@ jobs:
 
       - name: Install dependencies
         working-directory: openmetadata-ui/src/main/resources/ui/
-        run: yarn --frozen-lockfile
+        run: yarn --ignore-scripts --frozen-lockfile
       - name: Install Playwright Browsers
         run: npx playwright@1.44.1 install --with-deps
       - name: Run Playwright tests

diff --git a/.github/workflows/playwright-postgresql-e2e-skip.yml b/.github/workflows/playwright-postgresql-e2e-skip.yml
@@ -21,7 +21,6 @@ on:
       - opened
       - synchronize
       - reopened
-      - ready_for_review
     paths:
       - openmetadata-docs/**
       - .github/**

diff --git a/.github/workflows/playwright-postgresql-e2e.yml b/.github/workflows/playwright-postgresql-e2e.yml
@@ -21,7 +21,6 @@ on:
       - opened
       - synchronize
       - reopened
-      - ready_for_review
     paths-ignore:
       - openmetadata-docs/**
       - .github/**
@@ -96,7 +95,7 @@ jobs:
 
       - name: Install dependencies
         working-directory: openmetadata-ui/src/main/resources/ui/
-        run: yarn --frozen-lockfile
+        run: yarn --ignore-scripts --frozen-lockfile
       - name: Install Playwright Browsers
         run: npx playwright@1.44.1 install --with-deps
       - name: Run Playwright tests

diff --git a/.github/workflows/py-tests-postgres.yml b/.github/workflows/py-tests-postgres.yml
@@ -9,7 +9,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-name: py-tests
+name: py-tests-postgres
 on:
   workflow_dispatch:
   push:

diff --git a/bootstrap/sql/migrations/native/1.6.0/mysql/postDataMigrationSQLScript.sql b/bootstrap/sql/migrations/native/1.6.0/mysql/postDataMigrationSQLScript.sql
@@ -13,4 +13,18 @@ ADD COLUMN id VARCHAR(36) GENERATED ALWAYS AS (json ->> '$.id') STORED NOT NULL,
 ADD CONSTRAINT UNIQUE (id);
 
 -- Create index on id column
-CREATE INDEX data_quality_data_time_series_id_index ON data_quality_data_time_series (id);
+CREATE INDEX data_quality_data_time_series_id_index ON data_quality_data_time_series (id);
+
+-- Remove VIRTUAL status column from test_case table and remove
+-- testCaseResult state from testCase; fetch from search repo.
+ALTER TABLE test_case DROP COLUMN status;
+UPDATE test_case SET json = JSON_SET(json, '$.testCaseStatus', JSON_EXTRACT(json, '$.testCaseResult.testCaseStatus'));
+ALTER TABLE test_case ADD COLUMN status VARCHAR(56) GENERATED ALWAYS AS (JSON_UNQUOTE(JSON_EXTRACT(json, '$.testCaseStatus'))) STORED;
+
+
+-- Remove test case result states
+UPDATE test_suite
+SET json = JSON_REMOVE(json, '$.testCaseResultSummary');
+
+UPDATE test_case
+SET json = JSON_REMOVE(json, '$.testCaseResult');
diff --git a/bootstrap/sql/migrations/native/1.6.0/postgres/postDataMigrationSQLScript.sql b/bootstrap/sql/migrations/native/1.6.0/postgres/postDataMigrationSQLScript.sql
@@ -7,6 +7,7 @@ SET json = jsonb_set(
 FROM test_case tc
 WHERE dqdts.entityfqnHash = tc.fqnHash;
 
+
 -- Add id column to data_quality_data_time_series table
 -- after we have added the id values to the records
 ALTER TABLE data_quality_data_time_series
@@ -15,3 +16,17 @@ ADD CONSTRAINT id_unique UNIQUE (id);
 
 -- Create index on id column
 CREATE INDEX IF NOT EXISTS  data_quality_data_time_series_id_index  ON data_quality_data_time_series (id);
+
+-- Remove VIRTUAL status column from test_case table and remove
+-- testCaseResult state from testCase; fetch from search repo.
+ALTER TABLE test_case DROP COLUMN status;
+UPDATE test_case SET json = jsonb_set(json, '{testCaseStatus}', json->'testCaseResult'->'testCaseStatus');
+ALTER TABLE test_case ADD COLUMN status VARCHAR(56) GENERATED ALWAYS AS (json ->> 'testCaseStatus') STORED NULL;
+
+
+-- Remove test case result states
+UPDATE test_suite
+SET json = json - 'testCaseResultSummary';
+
+UPDATE test_case
+SET json = json - 'testCaseResult';
diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml
@@ -63,7 +63,6 @@ services:
       retries: 10
     volumes:
       - es-data:/usr/share/elasticsearch/data
-
 
   execute-migrate-all:
     build:

diff --git a/docker/run_local_docker.sh b/docker/run_local_docker.sh
@@ -56,10 +56,10 @@ docker compose -f docker/development/docker-compose.yml down
 if [[ $skipMaven == "false" ]]; then
     if [[ $mode == "no-ui" ]]; then
         echo "Maven Build - Skipping Tests and UI"
-        mvn -q -DskipTests -DonlyBackend clean package -pl !openmetadata-ui
+        mvn -DskipTests -DonlyBackend clean package -pl !openmetadata-ui
     else
         echo "Maven Build - Skipping Tests"
-        mvn -q -DskipTests clean package
+        mvn -DskipTests clean package
     fi
 else
     echo "Skipping Maven Build"