Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean useless processes and scripts #4153

Merged
merged 2 commits into from
Feb 28, 2022
Merged

Clean useless processes and scripts #4153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bb2d8b
clean scripts
solotzg Feb 28, 2022
6a70e68
1
solotzg Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/integration_test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ catchError {
sh """
rm -rf ${curws}/tics/contrib
rm -rf ${curws}/tics/.git
COMMIT_HASH=${params.ghprbActualCommit} PULL_ID=${params.ghprbPullId} TAR_PATH=${curws}/tics/tests/.build bash -e ${curws}/tics/release-centos7-llvm/scripts/fetch-ci-build.sh

COMMIT_HASH=${params.ghprbActualCommit} PULL_ID=${params.ghprbPullId} bash -e ${curws}/tics/release-centos7-llvm/scripts/fetch-ci-build.sh
"""
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/util.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def runTest(label, name, testPath, tidbBranch) {
container("docker") {
sh """
pwd
DOWNLOAD_TAR=true COMMIT_HASH=${params.ghprbActualCommit} PULL_ID=${params.ghprbPullId} TAR_PATH=./tests/.build bash -e release-centos7-llvm/scripts/fetch-ci-build.sh
DOWNLOAD_TAR=true COMMIT_HASH=${params.ghprbActualCommit} PULL_ID=${params.ghprbPullId} bash -e release-centos7-llvm/scripts/fetch-ci-build.sh
"""
}
}
Expand Down
2 changes: 0 additions & 2 deletions release-centos7-llvm/scripts/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
TIFLASH_CI_BUILD_URI_PREFIX="builds/pingcap/tiflash/ci-cache/tmp/pr-build"
TIFLASH_CI_BUILD_PRE_FIX="http://fileserver.pingcap.net/download/${TIFLASH_CI_BUILD_URI_PREFIX}"
CI_BUILD_INFO_PRE_FIX="commit hash value"
CI_CCACHE_USED_SRCPATH="/build/tics"
BUILD_DIR_SUFFIX="release-centos7-llvm/build-release"
Expand Down
3 changes: 3 additions & 0 deletions release-centos7-llvm/scripts/fetch-ci-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ SRCPATH=${1:-$(
source ${SRCPATH}/release-centos7-llvm/scripts/env.sh

DOWNLOAD_TAR=${DOWNLOAD_TAR:-false}
TAR_PATH=${SRCPATH}/tests/.build
TIFLASH_CI_BUILD_URI_PREFIX="builds/pingcap/tiflash/ci-cache/tmp/pr-build"
TIFLASH_CI_BUILD_PRE_FIX="http://fileserver.pingcap.net/download/${TIFLASH_CI_BUILD_URI_PREFIX}"

rm -rf "${TAR_PATH}"
mkdir -p "${TAR_PATH}"
Expand Down
3 changes: 3 additions & 0 deletions release-centos7-llvm/scripts/upload-ci-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ SRCPATH=${1:-$(

source ${SRCPATH}/release-centos7-llvm/scripts/env.sh

TIFLASH_CI_BUILD_URI_PREFIX="builds/pingcap/tiflash/ci-cache/tmp/pr-build"
TIFLASH_CI_BUILD_PRE_FIX="http://fileserver.pingcap.net/download/${TIFLASH_CI_BUILD_URI_PREFIX}"

TAR_BIN_URI="${TIFLASH_CI_BUILD_URI_PREFIX}/${PULL_ID}/tiflash.tar.gz"
COMMIT_HASH_FILE_URI="${TIFLASH_CI_BUILD_URI_PREFIX}/${PULL_ID}/commit-hash"

Expand Down
2 changes: 2 additions & 0 deletions tests/delta-merge-test/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ set_branch

set -xe

check_env

# We need to separate mock-test for dt and tmt, since this behavior
# is different in some tests
# * "tmt" engine ONLY support disable_bg_flush = false.
Expand Down
12 changes: 0 additions & 12 deletions tests/docker/gtest.yaml
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions tests/docker/util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,17 @@ function clean_data_log() {
rm -rf ./data ./log
}

function check_env() {
local cur_dir=$(pwd)
if [[ ! -d ${cur_dir}/../../tests/.build/tiflash ]]; then
echo "No pre-build tiflash binary directory: ${cur_dir}/../../tests/.build/tiflash"
exit -1
fi
}

export -f show_env
export -f wait_env
export -f wait_tiflash_env
export -f set_branch
export -f clean_data_log
export -f check_env
2 changes: 2 additions & 0 deletions tests/fullstack-test/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ set_branch

set -xe

check_env

# run fullstack-tests (for engine DeltaTree)
docker-compose -f cluster.yaml -f tiflash-dt.yaml down
clean_data_log
Expand Down
2 changes: 2 additions & 0 deletions tests/fullstack-test2/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ set_branch

set -xe

check_env

# run fullstack-tests (for engine DeltaTree)
docker-compose -f cluster.yaml -f tiflash-dt.yaml down
clean_data_log
Expand Down
1 change: 0 additions & 1 deletion tests/gtest/gtest.yaml
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions tests/gtest/run.sh
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions tests/tidb-ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ set_branch

set -xe

check_env

# run fullstack-tests (for engine DeltaTree)
docker-compose -f cluster.yaml -f tiflash-dt.yaml down
clean_data_log
Expand Down