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

fix: update docker daemon verisonn to docker:20.10.24-dind #2820

Merged
merged 5 commits into from
Feb 26, 2024
Merged

fix: update docker daemon verisonn to docker:20.10.24-dind #2820

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c4fead
Update br_ghpr_unit_and_integration_test.groovy
purelind Oct 18, 2023
d5c2a74
fix: support for qa-release-test trigger
purelind Oct 18, 2023
d647d61
fix: update docker daemon verisonn to docker:20.10.24-dind
purelind Feb 26, 2024
d8af2a4
Merge branch 'purelind-patch-2' of github.com:PingCAP-QE/ci into pure…
purelind Feb 26, 2024
a28aea0
fix: update docker dind version
purelind Feb 26, 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
21 changes: 19 additions & 2 deletions jenkins/pipelines/ci/tiflash/tiflash-ghpr-integration-tests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ def runTest(label, name, path, tidb_branch) {
nodeSelector: "kubernetes.io/arch=amd64",
instanceCap: 15,
containers: [
containerTemplate(name: 'dockerd', image: 'docker:18.09.6-dind', privileged: true,
containerTemplate(name: 'dockerd', image: 'docker:20.10.24-dind', privileged: true,
resourceRequestCpu: '5000m', resourceRequestMemory: '10Gi',
resourceLimitCpu: '16000m', resourceLimitMemory: '32Gi'),
resourceLimitCpu: '16000m', resourceLimitMemory: '32Gi',
envVars: [
envVar(key: 'DOCKER_TLS_CERTDIR', value: ''),
envVar(key: 'DOCKER_REGISTRY_MIRROR', value: 'https://registry-mirror.pingcap.net/'),
]),
containerTemplate(name: 'docker', image: 'hub.pingcap.net/jenkins/docker:build-essential-java',
alwaysPullImage: true, envVars: [envVar(key: 'DOCKER_HOST', value: 'tcp://localhost:2375')], ttyEnabled: true, command: 'cat')],
volumes: [
Expand All @@ -41,6 +45,19 @@ def runTest(label, name, path, tidb_branch) {
container("docker") {
try {
echo "path: ${pwd()}"
sh """
echo "wait docker daemon ready ..."
while true; do
if docker version &> /dev/null; then
echo "Docker daemon ready."
break
else
echo "Docker daemon not ready, wait..."
sleep 2
fi
done
docker version
"""
sh "TAG=${ghprbActualCommit} BRANCH=${tidb_branch} ./run.sh"
} catch (e) {
sh label: "debug fail", script: """
Expand Down