Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into bugfix/issue-716-u…
Browse files Browse the repository at this point in the history 
…df-memory-limit
  • Loading branch information
@yokofly
yokofly committed Dec 12, 2024
2 parents 81f005b + db5b1da commit 8fd65a1
Show file tree
Hide file tree
Showing 17 changed files with 361 additions and 244 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/compatibility_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}

compatibility_test:
if: ${{ github.event.inputs.source!='' }}
Expand Down Expand Up @@ -112,6 +112,6 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
63 changes: 33 additions & 30 deletions .github/workflows/manual_trigger_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ jobs:
pip install -r helpers/requirements.txt
pip list
df -h
python ci_runner.py --settings=redp,nativelog
df -h
echo "check test result"
cat $GITHUB_WORKSPACE/tests/stream/.status
Expand Down Expand Up @@ -107,9 +110,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
smoke_test_on_arm:
needs: prepare_smoke_test
uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
Expand All @@ -132,9 +135,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
prepare_query_compability_test:
runs-on: ubuntu-latest
if: ${{ github.event.inputs.has_query_compatibility_test == 'true' }}
Expand Down Expand Up @@ -208,9 +211,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TP_DEMO_API_KEY: ${{ secrets.TP_DEMO_API_KEY }}
TP_DEMO_SITE_API_KEY: ${{ secrets.TP_DEMO_SITE_API_KEY }}
query_compability_on_arm:
Expand All @@ -235,9 +238,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
TP_DEMO_API_KEY: ${{ secrets.TP_DEMO_API_KEY }}
TP_DEMO_SITE_API_KEY: ${{ secrets.TP_DEMO_SITE_API_KEY }}
prepare_unit_test:
Expand Down Expand Up @@ -283,9 +286,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
unit_test_on_arm:
needs: prepare_unit_test
uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
Expand All @@ -308,9 +311,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
prepare_stateless_test:
runs-on: ubuntu-latest
if: ${{ github.event.inputs.has_stateless_test == 'true' }}
Expand Down Expand Up @@ -355,9 +358,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
stateless_test_on_arm:
needs: prepare_stateless_test
uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
Expand All @@ -380,9 +383,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
prepare_stateful_test:
runs-on: ubuntu-latest
if: ${{ github.event.inputs.has_stateful_test == 'true' }}
Expand Down Expand Up @@ -427,9 +430,9 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
stateful_test_on_arm:
needs: prepare_stateful_test
uses: timeplus-io/proton/.github/workflows/run_command.yml@develop
Expand All @@ -452,6 +455,6 @@ jobs:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE }}
TIMEPLUS_ADDRESS: ${{ secrets.TIMEPLUS_ADDRESS2 }}
TIMEPLUS_API_KEY: ${{ secrets.TIMEPLUS_API_KEY2 }}
TIMEPLUS_WORKSPACE: ${{ secrets.TIMEPLUS_WORKSPACE2 }}
Loading

0 comments on commit 8fd65a1

Please sign in to comment.