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

feat(tiflash): start use rocky8 as base image #3186

Merged
merged 6 commits into from
Oct 30, 2024
Merged

feat(tiflash): start use rocky8 as base image #3186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f2beba
feat: start use rocky8 as base image
purelind Oct 28, 2024
84168c0
fix: chown file permission
purelind Oct 29, 2024
9989a43
Merge remote-tracking branch 'origin/main' into pureliknd/tiflash-ci-…
purelind Oct 29, 2024
d7534b9
fix: change dir permission
purelind Oct 29, 2024
5f3fe15
fix: chore format
purelind Oct 29, 2024
b83a9df
chore: update ccache file path
purelind Oct 29, 2024
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
2 changes: 1 addition & 1 deletion pipelines/pingcap/tiflash/latest/pod-pull_build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spec:
fsGroup: 1000
containers:
- name: runner
image: "hub.pingcap.net/tiflash/tiflash-llvm-base:amd64-llvm-17.0.6"
image: "hub.pingcap.net/tiflash/tiflash-llvm-base:llvm-17.0.6-rocky8"
command:
- "/bin/bash"
- "-c"
Expand Down
2 changes: 1 addition & 1 deletion pipelines/pingcap/tiflash/latest/pod-pull_unit-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Pod
spec:
containers:
- name: runner
image: "hub.pingcap.net/tiflash/tiflash-llvm-base:amd64-llvm-17.0.6"
image: "hub.pingcap.net/tiflash/tiflash-llvm-base:llvm-17.0.6-rocky8"
command:
- "cat"
tty: true
Expand Down
15 changes: 12 additions & 3 deletions pipelines/pingcap/tiflash/latest/pull_integration_test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ pipeline {
sh label: 'Debug info', script: """
printenv
echo "-------------------------"
go env
hostname
df -h
free -hm
gcc --version
cmake --version
clang --version
ccache --version
echo "-------------------------"
echo "debug command: kubectl -n ${K8S_NAMESPACE} exec -ti ${NODE_NAME} bash"
"""
Expand Down Expand Up @@ -124,7 +130,7 @@ pipeline {
script {
dir("tiflash") {
sh label: "copy ccache if exist", script: """
ccache_tar_file="/home/jenkins/agent/ccache/tiflash-amd64-linux-llvm-debug-master-failpoints.tar"
ccache_tar_file="/home/jenkins/agent/ccache/ccache-4.10.2/tiflash-amd64-linux-llvm-debug-${REFS.base_ref}-failpoints.tar"
if [ -f \$ccache_tar_file ]; then
echo "ccache found"
cd /tmp
Expand All @@ -138,7 +144,6 @@ pipeline {
sh label: "config ccache", script: """
ccache -o cache_dir="/tmp/.ccache"
ccache -o max_size=2G
ccache -o limit_multiple=0.99
ccache -o hash_dir=false
ccache -o compression=true
ccache -o compression_level=6
Expand All @@ -164,6 +169,7 @@ pipeline {
mkdir -p ${WORKSPACE}/tiflash/libs/libtiflash-proxy
cp \$proxy_cache_file ${WORKSPACE}/tiflash/libs/libtiflash-proxy/libtiflash_proxy.so
chmod +x ${WORKSPACE}/tiflash/libs/libtiflash-proxy/libtiflash_proxy.so
chown 1000:1000 ${WORKSPACE}/tiflash/libs/libtiflash-proxy/libtiflash_proxy.so
else
echo "proxy cache not found"
fi
Expand Down Expand Up @@ -366,6 +372,9 @@ pipeline {
}
steps {
dir("${WORKSPACE}/tiflash") {
sh label: "change permission", script: """
chown -R 1000:1000 ./
"""
cache(path: "./", includes: '**/*', key: prow.getCacheKey('tiflash', REFS, 'it-build')){
dir('tests/.build') {
sh label: "archive tiflash binary", script: """
Expand Down
13 changes: 9 additions & 4 deletions pipelines/pingcap/tiflash/latest/pull_unit_test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Boolean build_cache_ready = false
Boolean proxy_cache_ready = false
String proxy_commit_hash = null


pipeline {
agent {
kubernetes {
Expand All @@ -38,10 +37,13 @@ pipeline {
sh label: 'Debug info', script: """
printenv
echo "-------------------------"
env
hostname
df -h
free -hm
gcc --version
cmake --version
clang --version
ccache --version
echo "-------------------------"
echo "debug command: kubectl -n ${K8S_NAMESPACE} exec -ti ${NODE_NAME} bash"
"""
Expand Down Expand Up @@ -126,7 +128,7 @@ pipeline {
dir("tiflash") {
sh label: "copy ccache if exist", script: """
pwd
ccache_tar_file="/home/jenkins/agent/ccache/pagetools-tests-amd64-linux-llvm-debug-master-failpoints.tar"
ccache_tar_file="/home/jenkins/agent/ccache/ccache-4.10.2/pagetools-tests-amd64-linux-llvm-debug-${REFS.base_ref}-failpoints.tar"
if [ -f \$ccache_tar_file ]; then
echo "ccache found"
cd /tmp
Expand All @@ -140,7 +142,6 @@ pipeline {
sh label: "config ccache", script: """
ccache -o cache_dir="/tmp/.ccache"
ccache -o max_size=2G
ccache -o limit_multiple=0.99
ccache -o hash_dir=false
ccache -o compression=true
ccache -o compression_level=6
Expand All @@ -165,6 +166,7 @@ pipeline {
mkdir -p ${WORKSPACE}/tiflash/libs/libtiflash-proxy
cp \$proxy_cache_file ${WORKSPACE}/tiflash/libs/libtiflash-proxy/libtiflash_proxy.so
chmod +x ${WORKSPACE}/tiflash/libs/libtiflash-proxy/libtiflash_proxy.so
chown 1000:1000 ${WORKSPACE}/tiflash/libs/libtiflash-proxy/libtiflash_proxy.so
else
echo "proxy cache not found"
fi
Expand Down Expand Up @@ -343,6 +345,9 @@ pipeline {
steps {
script {
dir("${WORKSPACE}/tiflash") {
sh label: "change permission", script: """
chown -R 1000:1000 ./
"""
cache(path: "./", includes: '**/*', key: prow.getCacheKey('tiflash', REFS, 'ut-build')) {
if (build_cache_ready) {
println "build cache exist, restore from cache key: ${prow.getCacheKey('tiflash', REFS, 'ut-build')}"
Expand Down