Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 9 additions & 10 deletions pipelines/pingcap/tiflash/release-6.5/pull_integration_test.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 +267,15 @@ pipeline {
timeout 300 docker pull "${PD_IMAGE}"
timeout 300 docker pull "${TIKV_IMAGE}"
timeout 300 docker pull "${TIDB_IMAGE}"
# 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
# release-6.5: OCI may still publish a :failpoint tag, but it does not expose
# enableTestAPI (fail-point-tests fail on curl_tidb get fail/.../enableTestAPI).
# Always use the regular TiDB image and skip suites that need real failpoints.
timeout 300 docker pull "${TIDB_FAILPOINT_IMAGE}" || true
echo "WARN: release-6.5 TiDB failpoint image is not usable for IT; 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"
sed -i -e 's#./run-test.sh tidb-ci/fail-point-tests && ##g' ./run.sh
fi
# Old hub.pingcap.net/tiflash/tiflash-ci-base included mysql client for run-test.sh.
# Builder images do not; rebuild the historical runtime locally (see tiflash_ci_base Dockerfile).
Expand Down