Skip to content

Commit 97e1bb2

Browse files
authored
Merge pull request #6965 from ZeaLoVe/split-logictest
ci: split logictest into two parts base and ydb
2 parents f16185a + c251cf7 commit 97e1bb2

File tree

239 files changed

+24
-4
lines changed

Some content is hidden

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

239 files changed

+24
-4
lines changed

.github/actions/test_sqllogic_standalone_linux/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ inputs:
99
description: ""
1010
required: true
1111
default: "x86_64-unknown-linux-gnu"
12+
dirs:
13+
description: "logic test suites dirs"
14+
required: true
15+
default: ""
1216
runs:
1317
using: "composite"
1418
steps:
@@ -27,7 +31,7 @@ runs:
2731
- name: Run sqllogic Tests with Standalone mode with embedded meta-store
2832
shell: bash
2933
run: |
30-
bash ./scripts/ci/ci-run-sqllogic-tests.sh
34+
bash ./scripts/ci/ci-run-sqllogic-tests.sh ${{ inputs.dirs }}
3135
3236
# - name: Upload failure
3337
# if: failure()

.github/mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ queue_rules:
1313
- check-success=test_stateless_standalone_linux
1414
- check-success=test_stateless_cluster_linux
1515
- check-success=test_stateful_standalone_linux
16-
- check-success=test_sqllogic_standalone_linux
16+
- check-success~=^test_sqllogic_(base|ydb)_standalone_linux$
1717

1818
- name: docs_queue
1919
conditions:

.github/workflows/dev-linux.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,20 @@ jobs:
121121
- uses: ./.github/actions/test_stateless_cluster_linux
122122

123123
test_sqllogic_standalone_linux:
124-
timeout-minutes: 20
124+
timeout-minutes: 15
125+
name: test_sqllogic_${{ matrix.dirs }}_standalone_linux
125126
runs-on: [self-hosted, X64, Linux, development]
126127
needs: build_gnu
128+
strategy:
129+
matrix:
130+
dirs:
131+
- "base"
132+
- "ydb"
127133
steps:
128134
- uses: actions/checkout@v3
129135
- uses: ./.github/actions/test_sqllogic_standalone_linux
136+
with:
137+
dirs: ${{ matrix.dirs }}
130138

131139
test_stateful_standalone_linux:
132140
timeout-minutes: 10

scripts/ci/ci-run-sqllogic-tests.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,11 @@ echo "Starting standalone DatabendQuery and DatabendMeta"
88
SCRIPT_PATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
99
cd "$SCRIPT_PATH/../../tests/logictest" || exit
1010

11+
RUN_DIR=""
12+
if [ $# -gt 0 ];then
13+
RUN_DIR="--run-dir $*"
14+
fi
15+
echo "Run suites using argument: $RUN_DIR"
16+
1117
echo "Starting databend-sqllogic tests"
12-
python3 main.py
18+
python3 main.py $RUN_DIR

tests/logictest/suites/select_0

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
-- This file use for debug logictest itself.
2+
13
statement ok
24
create database if not exists db1;
35

0 commit comments

Comments
 (0)