Skip to content

Commit

Permalink
fix: update docker daemon verisonn to docker:20.10.24-dind (#2820)
Browse files Browse the repository at this point in the history
update docker daemon verisonn to docker:20.10.24-dind, to resolve the
error encountered when starting the tidb container.


![img_v3_028e_40fbacf4-6e77-44ad-8747-37a9484d5bfg](https://github.com/PingCAP-QE/ci/assets/16618216/5a1341d9-424f-4d19-82dd-ee81947df791)

---------

Signed-off-by: purelind <[email protected]>
  • Loading branch information
purelind authored Feb 26, 2024
1 parent fadc507 commit 8ffd694
Showing 1 changed file with 19 additions and 2 deletions.
21 changes: 19 additions & 2 deletions jenkins/pipelines/ci/tiflash/tiflash-ghpr-integration-tests.groovy
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

0 comments on commit 8ffd694

Please sign in to comment.