external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

not run other tests with hammerdb jobs

tpcc_benchmark/refactorManagerWorkerPool
Sait Talha Nisanci 2020-04-20 12:24:40 +03:00
parent 409be6ea05
commit dcdd510d75
2 changed files with 116 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
.circleci/config.yml
View File

@ -235,7 +235,7 @@ jobs:
ch_benchmark: ch_benchmark:
docker: docker:
- image: buildpack-deps:stretch - image: buildpack-deps:stretch
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout - checkout
- azure-cli/install - azure-cli/install
@ -245,11 +245,11 @@ jobs:
cd ./src/test/hammerdb cd ./src/test/hammerdb
sh run_hammerdb.sh citusbot_ch_benchmark_rg sh run_hammerdb.sh citusbot_ch_benchmark_rg
name: install dependencies and run ch_benchmark tests name: install dependencies and run ch_benchmark tests
no_output_timeout: 20m no_output_timeout: 20m
tpcc_benchmark: tpcc_benchmark:
docker: docker:
- image: buildpack-deps:stretch - image: buildpack-deps:stretch
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout - checkout
- azure-cli/install - azure-cli/install
@ -259,11 +259,11 @@ jobs:
cd ./src/test/hammerdb cd ./src/test/hammerdb
sh run_hammerdb.sh citusbot_tpcc_benchmark_rg sh run_hammerdb.sh citusbot_tpcc_benchmark_rg
name: install dependencies and run ch_benchmark tests name: install dependencies and run ch_benchmark tests
no_output_timeout: 20m no_output_timeout: 20m
orbs: orbs:
codecov: codecov/codecov@1.0.5 codecov: codecov/codecov@1.0.5
azure-cli: circleci/azure-cli@1.0.0 azure-cli: circleci/azure-cli@1.0.0
workflows: workflows:
version: 2 version: 2
@ -279,39 +279,114 @@ workflows:
filters: filters:
branches: branches:
only: only:
- /tpcc_benchmark\/.*/ # match with tpcc_benchmark/ prefix - /tpcc_benchmark\/.*/ # match with tpcc_benchmark/ prefix
# build_and_test: build_and_test:
# jobs: jobs:
# - build - build:
# - check-style filters:
# - check-sql-snapshots branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
- check-style:
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
- check-sql-snapshots:
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
# - test-11_check-multi: - test-11_check-multi:
# requires: [build] requires: [build]
# - test-11_check-tt-van-mx: filters:
# requires: [build] branches:
# - test-11_check-iso-work-fol: ignore:
# requires: [build] - /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
# - test-11_check-fol: - /ch_benchmark\/.*/ # ignore ch_benchmark/
# requires: [build] - test-11_check-tt-van-mx:
# - test-11_check-failure: requires: [build]
# requires: [build] filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
- test-11_check-iso-work-fol:
requires: [build]
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
- test-11_check-fol:
requires: [build]
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
- test-11_check-failure:
requires: [build]
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
# - test-12_check-multi: - test-12_check-multi:
# requires: [build] requires: [build]
# - test-12_check-tt-van-mx: filters:
# requires: [build] branches:
# - test-12_check-iso-work-fol: ignore:
# requires: [build] - /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
# - test-12_check-fol: - /ch_benchmark\/.*/ # ignore ch_benchmark/
# requires: [build] - test-12_check-tt-van-mx:
# - test-12_check-failure: requires: [build]
# requires: [build] filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
- test-12_check-iso-work-fol:
requires: [build]
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
- test-12_check-fol:
requires: [build]
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
- test-12_check-failure:
requires: [build]
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
# - test-11-12_check-pg-upgrade: - test-11-12_check-pg-upgrade:
# requires: [build] requires: [build]
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/
# - test-11_check-citus-upgrade: - test-11_check-citus-upgrade:
# requires: [build] requires: [build]
filters:
branches:
ignore:
- /tpcc_benchmark\/.*/ # ignore tpcc_benchmark/
- /ch_benchmark\/.*/ # ignore ch_benchmark/

14
src/test/hammerdb/run_hammerdb.sh
View File

@ -21,7 +21,7 @@ set +x
git config --global credential.helper store git config --global credential.helper store
#TODO:: after hammerdbChanges is merged, use master. #TODO:: after hammerdbChanges is merged, use master.
git clone -b hammerdbChanges https://${GIT_USERNAME}:${GIT_TOKEN}@github.com/citusdata/test-automation git clone -b hammerdbChanges https://${GIT_USERNAME}:${GIT_TOKEN}@github.com/citusdata/test-automation
set -x set -x
cd test-automation cd test-automation
@ -41,10 +41,8 @@ branch_config=current_branch.ini
# create a config for this branch # create a config for this branch
cp master.ini "${branch_config}" cp master.ini "${branch_config}"
# escape / in branch name otherwise sed won't work.
BRANCH_ESCAPED=$(echo "$BRANCH" | sed 's/[\/\.]/\\&/g')
# put the branch name to the config file. # put the branch name to the config file.
sed -i "s/master/${BRANCH_ESCAPED}/g" "${branch_config}" sed -i "s@master@${BRANCH}@g" "${branch_config}"
cd "${test_automation_dir}" cd "${test_automation_dir}"
cd ./hammerdb cd ./hammerdb
@ -53,8 +51,8 @@ cd ./hammerdb
sed -i "s/pg_duration 200/pg_duration 10/g" run.tcl sed -i "s/pg_duration 200/pg_duration 10/g" run.tcl
git config --global user.email "citus-bot@microsoft.com" git config --global user.email "citus-bot@microsoft.com"
git config --global user.name "citus bot" git config --global user.name "citus bot"
git add -A git add -A
git commit -m "test hammerdb: ${rg} vs master" git commit -m "test hammerdb: ${rg} vs master"
git push origin "${new_branch_name}" git push origin "${new_branch_name}"
@ -65,12 +63,12 @@ cd ./hammerdb
if [ "$rg" = "citusbot_ch_benchmark_rg" ]; then if [ "$rg" = "citusbot_ch_benchmark_rg" ]; then
export IS_CH=true export IS_CH=true
export IS_TPCC=true export IS_TPCC=true
fi fi
if [ "$rg" = "citusbot_tpcc_benchmark_rg" ]; then if [ "$rg" = "citusbot_tpcc_benchmark_rg" ]; then
export IS_CH=false export IS_CH=false
export IS_TPCC=true export IS_TPCC=true
fi fi
# create cluster and run the hammerd benchmark # create cluster and run the hammerd benchmark
./create-run.sh ./create-run.sh