From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 27 May 2025 12:32:34 +0000 (+0200)
Subject: CI: vtest: Rely on VTest2 to run regression tests
X-Git-Tag: v3.2.0~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a18d28ba20439a94ec38e6670e1b7b2a864bde8;p=thirdparty%2Fhaproxy.git

CI: vtest: Rely on VTest2 to run regression tests

VTest2 (https://github.com/vtest/VTest2) was released and is a remplacement
for VTest. VTest was archived. So let's use the new version now.

If this commit is backported, the 2 following commits must also be
backported:

 * 2808e3577 ("REGTESTS: Explicitly allow failing shell commands in some scripts")
 * 82c291124 ("REGTESTS: Make the script testing conditional set-var compatible with Vtest2")
---

diff --git a/reg-tests/README b/reg-tests/README
index ef721fdff..e77d0cce3 100644
--- a/reg-tests/README
+++ b/reg-tests/README
@@ -14,7 +14,7 @@ See also: doc/regression-testing.txt
 
 * vtest compilation *
 
-    $ git clone https://github.com/vtest/VTest
+    $ git clone https://github.com/vtest/VTest2
 
     $ cd VTest
 
diff --git a/scripts/build-vtest.sh b/scripts/build-vtest.sh
index b9945078b..3da427622 100755
--- a/scripts/build-vtest.sh
+++ b/scripts/build-vtest.sh
@@ -2,7 +2,7 @@
 
 set -eux
 
-curl -fsSL https://github.com/wlallemand/VTest/archive/refs/heads/haproxy-sd_notify.tar.gz -o VTest.tar.gz
+curl -fsSL https://github.com/vtest/VTest2/archive/main.tar.gz  -o VTest.tar.gz
 mkdir ../vtest
 tar xvf VTest.tar.gz -C ../vtest --strip-components=1
 # Special flags due to: https://github.com/vtest/VTest/issues/12