Skip to content

Commit 193b202

Browse files
committed
Merge remote-tracking branch 'origin/batch_pipeline_status' into batch_pipeline_status
2 parents d15675f + da96314 commit 193b202

File tree

208 files changed

+5269
-3812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+5269
-3812
lines changed

.github/workflows/playwright-postgresql-e2e.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ jobs:
9595
uses: ./.github/actions/setup-openmetadata-test-environment
9696
with:
9797
python-version: "3.10"
98-
args: "-d postgresql"
98+
# Pass different args depending on the shardIndex:
99+
# - shard 2: run with ingestion setup
100+
# - other shards: skip ingestion setup
101+
args: ${{ matrix.shardIndex == 2 && '-d postgresql' || '-d postgresql -i false' }}
99102
ingestion_dependency: "all"
100103

101104
- name: Setup Node.js
@@ -118,27 +121,24 @@ jobs:
118121
npx playwright test \
119122
--project=setup \
120123
--project=DataAssetRulesEnabled \
121-
--project=DataAssetRulesDisabled
124+
--project=DataAssetRulesDisabled \
125+
--project=Basic \
126+
127+
elif [ "${{ matrix.shardIndex }}" -eq "2" ]; then
128+
echo "🔹 Running ingestion tests on shard 2"
129+
130+
# run ingestion framework tests
131+
npx playwright test \
132+
--project=ingestion \
122133
123134
else
124-
# Shards 2-6 handle chromium tests (5 workers total)
125-
CHROMIUM_SHARD=$(( ${{ matrix.shardIndex }} - 1 ))
126-
if [[ "${{ contains(github.event.pull_request.changed_files, 'ingestion/') }}" == "true" ]]; then
127-
echo "🔹 Running ingestion tests on chromium shard ${CHROMIUM_SHARD}/5"
128-
npx playwright test \
129-
--project=chromium \
130-
--grep @ingestion \
131-
--grep-invert @dataAssetRules \
132-
--shard=${CHROMIUM_SHARD}/5
133-
--workers=50%
134-
135-
else
136-
echo "🔹 Running all other tests (excluding DataAssetRules) on chromium shard ${CHROMIUM_SHARD}/5"
137-
npx playwright test \
138-
--project=chromium \
139-
--grep-invert @dataAssetRules \
140-
--shard=${CHROMIUM_SHARD}/5
141-
fi
135+
# Shards 3-6 handle chromium tests (4 workers total)
136+
CHROMIUM_SHARD=$(( ${{ matrix.shardIndex }} - 2 ))
137+
echo "🔹 Running all other tests (excluding DataAssetRules) on chromium shard ${CHROMIUM_SHARD}/4"
138+
npx playwright test \
139+
--project=chromium \
140+
--grep-invert @dataAssetRules \
141+
--shard=${CHROMIUM_SHARD}/4
142142
fi
143143
144144
env:

docker/development/distributed-test/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949

5050
# Shared OpenSearch
5151
opensearch:
52-
image: opensearchproject/opensearch:2.7.0
52+
image: opensearchproject/opensearch:3.4.0
5353
container_name: distributed_test_opensearch
5454
restart: unless-stopped
5555
environment:

docker/development/distributed-test/local/docker-compose-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949

5050
# OpenSearch
5151
opensearch:
52-
image: opensearchproject/opensearch:2.7.0
52+
image: opensearchproject/opensearch:3.4.0
5353
container_name: distributed_test_opensearch
5454
restart: unless-stopped
5555
environment:

docker/development/docker-compose-gcp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
- ./docker-volume/db-data:/var/lib/mysql
4747

4848
elasticsearch:
49-
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
49+
image: docker.elastic.co/elasticsearch/elasticsearch:9.3.0
5050
container_name: openmetadata_elasticsearch
5151
environment:
5252
- discovery.type=single-node

docker/development/docker-compose-postgres-fuseki.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
retries: 10
4545

4646
opensearch:
47-
image: opensearchproject/opensearch:latest
47+
image: opensearchproject/opensearch:3.4.0
4848
container_name: openmetadata_opensearch
4949
environment:
5050
- discovery.type=single-node

docker/development/docker-compose-postgres.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ services:
4343
retries: 10
4444

4545
opensearch:
46-
image: opensearchproject/opensearch:latest
46+
image: opensearchproject/opensearch:3.4.0
4747
container_name: openmetadata_opensearch
4848
environment:
4949
- discovery.type=single-node

docker/development/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ services:
4242
- ./docker-volume/db-data:/var/lib/mysql
4343

4444
elasticsearch:
45-
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
45+
image: docker.elastic.co/elasticsearch/elasticsearch:9.3.0
4646
container_name: openmetadata_elasticsearch
4747
environment:
4848
- discovery.type=single-node

docker/development/helm/docker-compose-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
# OpenSearch for metadata search
4545
opensearch:
4646
container_name: openmetadata_opensearch_test
47-
image: opensearchproject/opensearch:2.11.1
47+
image: opensearchproject/opensearch:3.4.0
4848
restart: always
4949
environment:
5050
- discovery.type=single-node

docker/docker-compose-quickstart/docker-compose-opensearch-standalone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Standalone OpenSearch 2.19 with security disabled for local testing
1+
# Standalone OpenSearch 3.0 with security disabled for local testing
22
services:
33
opensearch:
4-
image: opensearchproject/opensearch:2.19.0
4+
image: opensearchproject/opensearch:3.4.0
55
platform: linux/arm64 # Native ARM64 support
66
container_name: opensearch-standalone
77
hostname: opensearch

docker/docker-compose-quickstart/docker-compose-postgres.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ services:
4141

4242
elasticsearch:
4343
container_name: openmetadata_elasticsearch
44-
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
44+
image: docker.elastic.co/elasticsearch/elasticsearch:9.3.0
4545
environment:
4646
- discovery.type=single-node
4747
- ES_JAVA_OPTS=-Xms1024m -Xmx1024m

0 commit comments

Comments
 (0)