Skip to content

Commit

Permalink
test: fix centos release (#376)
Browse files Browse the repository at this point in the history
* test: refine tests for taosdump

* test: rm tests/CMakeLists.txt

* test: change workflow accordingly

* fix: taosdump ws float null

* test: coveralls.yml includes websocket test

* fix: disable taosdump/ws dep

* fix: wrong filename in cmake file

* test: add more test cases

* test: add expect test taosdump password

* fix: ci-taosdump-release-ws.yml wrong branch

* test: cherry pick from other branch

* test: add tools path finding for 3.0

* test: remove days/blocks for 3.0

* fix: .github/workflows/non-x64.yml

* test: add vnodes=256 env variable for 3.0

* test: fix windows-build-for3.0.yml

* test: disable ws for tdengine 2.0

* test: disable ws for tdengine 2.0 on centos

* fix: windows compile

* fix: check windows macro

* test: use test/sangshuduo/TD-17080-taosdump-functest on windows build

* fix: pip3 install taospy on centos

* test: add 3.0-coveralls.yml

* fix: replace test branch with 3.0

* fix: add expect install

* fix: stb pointer is null on tdengine 3.0

* test: add basic test cases

* fix: use ins_ instead of user_

* fix: select tbname,stbname from schema

* test: remove taosdump3.py

* test: add ws3 test

* test: remove nested query case

* test: remove taosdemo old test case

* fix: refine coverage test

* test: use test/sangshuduo/TD-17080-taosdump-functest

* test: disable taosdump test col tag case

* fix: change actions to 3.0 branch

* fix: run actions on push too

* fix: make 3.0-coveralls.yml run on push

* fix: remove unused debug info

* test: use jom for windows compile

* test: allow to test system program

* test: move coverage to topdir

* test: revise .github/workflows/3.0-coveralls.yml

* test: check changed file in ../.github/workflows/centos-release.yml

* test: add tests/taosdump/old cases

* fix: make info print to stdout

* test: change test case to take system program at last

* test: remove stderr redirect in ../../.github/workflows/3.0-coveralls.yml

* test: change 3.0-taosdump-release.yml to test stand aline taos-tools

* test: add 3.0 taosbenchmark release workflow

* test: exclude sml_, telnet_tcp and websocket test

* test: fix centos release

Co-authored-by: Yang Zhao <yzhao@taosdata.com>
  • Loading branch information
sangshuduo and Yang Zhao authored Sep 19, 2022
1 parent d2477e8 commit 701f55c
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 31 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/3.0-coveralls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,9 @@ jobs:
- name: Checkout taos-tools to PR number
if: |
github.event_name == 'pull_request' &&
steps.changed-files-specific.outputs.any_changed == 'true'
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
run: |
git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge
git checkout -qf FETCH_HEAD
Expand Down
36 changes: 27 additions & 9 deletions .github/workflows/3.0-taosBenchmark-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,27 @@ jobs:
- name: Checkout taos-tools to PR number
if: |
github.event_name == 'pull_request' &&
steps.changed-files-specific.outputs.any_changed == 'true'
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
run: |
git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge
git checkout -qf FETCH_HEAD
- name: Set up Go
if: steps.changed-files-specific.outputs.any_changed == 'true'
if: |
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
uses: actions/setup-go@v3
with:
go-version: 1.14

- name: Set up Rust
if: steps.changed-files-specific.outputs.any_changed == 'true'
if: |
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand All @@ -97,7 +104,10 @@ jobs:
key: ${{ runner.os }}-cargo-${{ steps.setup-rust.outputs.rustc_hash }}

- name: Build & Install TDengine
if: steps.changed-files-specific.outputs.any_changed == 'true'
if: |
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
run: |
cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug
if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taosadapter ]]
Expand All @@ -115,11 +125,11 @@ jobs:
sudo apt update > /dev/null
sudo apt-get install lzma-dev liblzma-dev libjansson-dev libz-dev libsnappy-dev pkg-config expect -y > /dev/null
- name: Checkout taos-tools to PR number
if: |
github.event_name == 'pull_request' &&
steps.changed-files-specific.outputs.any_changed == 'true'
if:
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
run: |
git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge
git checkout -qf FETCH_HEAD
Expand All @@ -137,6 +147,10 @@ jobs:
pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null
- name: Test
if:
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
run: |
cd tests
Expand All @@ -151,6 +165,10 @@ jobs:
fi
- name: Check Test Result
if:
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
run: |
if [ -f ~/taosbenchmark-release-failed.txt ];then
cat ~/taosbenchmark-release-failed.txt
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/3.0-taosdump-release-ws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,9 @@ jobs:

- name: Checkout taos-tools to PR number
if: |
github.event_name == 'pull_request' &&
steps.changed-files-specific.outputs.any_changed == 'true'
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
run: |
git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge
git checkout -qf FETCH_HEAD
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/3.0-taosdump-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,17 @@ jobs:
fi
- name: Install packages for build taos-tools
if:
if: |
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
run: sudo apt-get install lzma-dev liblzma-dev libjansson-dev libz-dev libsnappy-dev pkg-config lcov expect -y > /dev/null

- name: Checkout taos-tools to PR number
if: |
github.event_name == 'pull_request' &&
steps.changed-files-specific.outputs.any_changed == 'true'
(steps.changed-files-specific.outputs.any_changed == 'true'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
run: |
git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge
git checkout -qf FETCH_HEAD
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/centos-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,8 @@ jobs:
- name: Checkout TDengine's taos-tools to PR number
if: |
(needs.changed.result == 'success'
&& github.event_name == 'pull_request')
|| github.event_name == 'push'
steps.changed-files-specific.outputs.any_changed == 'true' &&
github.event_name == 'pull_request'
run: |
cd TDengine/src/kit/taos-tools
git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/ci-taosdump-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,6 @@ jobs:
sudo timedatectl set-timezone Asia/Shanghai
sudo date
#- name: Checkout TDengine with same branch of taos-tools
#run: |
#cd TDengine
#git pull
#git branch -a | grep -w ${{ github.head_ref }} \
# && git checkout ${{ github.head_ref }} \
# && rm -rf tests \
# && git submodule update --init --recursive --force \
# || echo "${{ github.head_ref }} not found in TDengine"
#if: github.event_name == 'pull_request'
- name: Checkout TDengine's taos-tools to PR number
if: |
steps.changed-files-specific.outputs.any_changed == 'true' &&
Expand Down

0 comments on commit 701f55c

Please sign in to comment.