From 584d06b18f174b736808218a9d7bb6b201c85e07 Mon Sep 17 00:00:00 2001 From: kumailf Date: Tue, 28 Jul 2026 13:45:37 +0800 Subject: [PATCH 1/2] fix(pipelines/tiflash): rewrite untagged tiflash-ci-base on release-6.5 release-6.5 integration yamls still use hub.pingcap.net/tiflash/tiflash-ci-base without a tag, which the existing rocky8/rocky9 sed rules miss. Map that untagged image to TIFLASH_TEST_IMAGE so compose no longer hits the retired registry. --- .../pingcap/tiflash/release-6.5/pull_integration_test.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy b/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy index 09eb30ad43..3bb8a7e597 100644 --- a/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy +++ b/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy @@ -278,6 +278,7 @@ pipeline { -e 's#${TIFLASH_IMAGE:[^}]*}#'"${TIFLASH_IMAGE}"'#g' \ -e "s#[[:alnum:].-]*[.][[:alnum:].-]*/tiflash/tiflash-ci-base:rocky8-20241028#${TIFLASH_IMAGE}#g" \ -e "s#[[:alnum:].-]*[.][[:alnum:].-]*/tiflash/tiflash-ci-base:rocky9-20250529#${TIFLASH_IMAGE}#g" \ + -e 's#[[:alnum:].-]*[.][[:alnum:].-]*/tiflash/tiflash-ci-base$#'"${TIFLASH_IMAGE}"'#g' \ -e 's#[[:alnum:].-]*[.][[:alnum:].-]*/tiflash/tics:${TAG:-master}#'"${TIFLASH_IMAGE}"'#g' \ -e 's#[[:alnum:].-]*[.][[:alnum:].-]*/tikv/pd/image:${PD_BRANCH:-master}#'"${PD_IMAGE}"'#g' \ -e "s#[[:alnum:].-]*[.][[:alnum:].-]*/tikv/pd/image:master#${PD_IMAGE}#g" \ From 4b0941d1419b1052af849c839aa3de56b15eb7a4 Mon Sep 17 00:00:00 2001 From: kumailf Date: Tue, 28 Jul 2026 13:55:06 +0800 Subject: [PATCH 2/2] fix(pipelines/tiflash): fallback when release-6.5 tidb failpoint image missing If tidb-server:release-6.5-failpoint cannot be pulled, reuse the regular release-6.5 TiDB image for compose rewrites and skip tidb-ci/fail-point-tests. --- .../tiflash/release-6.5/pull_integration_test.groovy | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy b/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy index 3bb8a7e597..ba1734bd58 100644 --- a/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy +++ b/pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy @@ -267,7 +267,17 @@ pipeline { timeout 300 docker pull "${PD_IMAGE}" timeout 300 docker pull "${TIKV_IMAGE}" timeout 300 docker pull "${TIDB_IMAGE}" - timeout 300 docker pull "${TIDB_FAILPOINT_IMAGE}" || true + # release-6.5 failpoint images may no longer be published. + # Fall back to the regular branch image so compose does not hard-fail on a missing tag, + # and skip fail-point-tests that require a real failpoint TiDB binary. + if ! timeout 300 docker pull "${TIDB_FAILPOINT_IMAGE}"; then + echo "WARN: ${TIDB_FAILPOINT_IMAGE} not found; falling back to ${TIDB_IMAGE}" + TIDB_FAILPOINT_IMAGE="${TIDB_IMAGE}" + if [ -f ./run.sh ] && grep -q 'tidb-ci/fail-point-tests' ./run.sh; then + echo "WARN: skipping tidb-ci/fail-point-tests because TiDB failpoint image is unavailable" + sed -i -e 's#./run-test.sh tidb-ci/fail-point-tests && ##g' ./run.sh + fi + fi timeout 600 docker pull "${TIFLASH_IMAGE}" find ../docker . -name '*.yaml' -type f -exec sed -i \