From: William Lallemand Date: Wed, 18 Nov 2026 14:42:38 +0000 (+0000) Subject: CI: github: use haproxytech/VTest2 for regression tests X-Git-Tag: v3.5-dev13~9 X-Git-Url: https://git.kaiwu.me/web/%22data:,/doc/static/%7B@url%7D?a=commitdiff_plain;h=62daf6c1e112f708c01a24d3b5474d07b9df82e0;p=haproxy.git CI: github: use haproxytech/VTest2 for regression tests The official VTest2 repository frequently causes CI failures. Use the haproxytech/VTest2 repository instead. Point the shared VTest setup action and the FreeBSD workflow at the haproxytech/VTest2 repository for both cache SHA lookups and builds. Select the build source through VTEST_URL, leaving the script default unchanged. This could be backported together with the previous commit, 691e22fbbd ("SCRIPTS: vtest: allow overriding the Git repository URL"). --- diff --git a/.github/actions/setup-vtest/action.yml b/.github/actions/setup-vtest/action.yml index e2857296c..5212c30f7 100644 --- a/.github/actions/setup-vtest/action.yml +++ b/.github/actions/setup-vtest/action.yml @@ -32,7 +32,7 @@ runs: id: vtest-sha shell: sh run: | - echo "sha=$(git ls-remote https://code.vinyl-cache.org/vtest/VTest2 HEAD | cut -f1)" >> $GITHUB_OUTPUT + echo "sha=$(git ls-remote https://github.com/haproxytech/VTest2 HEAD | cut -f1)" >> $GITHUB_OUTPUT - name: Restore VTest cache id: cache-vtest @@ -46,7 +46,7 @@ runs: shell: sh run: | # Use the runtime workspace, not the host-side github.workspace path. - DESTDIR="$GITHUB_WORKSPACE/vtest" scripts/build-vtest.sh + VTEST_URL=https://github.com/haproxytech/VTest2 DESTDIR="$GITHUB_WORKSPACE/vtest" scripts/build-vtest.sh - name: Save VTest cache if: ${{ steps.cache-vtest.outputs.cache-hit != 'true' }} diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 3099ceb00..93807200e 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -22,7 +22,7 @@ jobs: id: vtest-sha shell: sh run: | - sha=$(git ls-remote https://code.vinyl-cache.org/vtest/VTest2 HEAD | cut -f1) + sha=$(git ls-remote https://github.com/haproxytech/VTest2 HEAD | cut -f1) if [ -n "${sha}" ]; then echo "sha=${sha}" >> "$GITHUB_OUTPUT" fi @@ -47,7 +47,7 @@ jobs: sysctl kern.corefile=/tmp/%N.%P.core sysctl kern.sugid_coredump=1 if ! "${GITHUB_WORKSPACE}/vtest/vtest" -V >/dev/null 2>&1; then - DESTDIR="${GITHUB_WORKSPACE}/vtest" scripts/build-vtest.sh + VTEST_URL=https://github.com/haproxytech/VTest2 DESTDIR="${GITHUB_WORKSPACE}/vtest" scripts/build-vtest.sh fi "${GITHUB_WORKSPACE}/vtest/vtest" -V gmake CC=clang V=1 ERR=1 TARGET=freebsd USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_OPENSSL=1 USE_LUA=1 LUA_INC=/usr/local/include/lua54 LUA_LIB=/usr/local/lib LUA_LIB_NAME=lua-5.4