Skip to content

9.2.x: Proxy Verfier Upgrade to v2.10.1 #10389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwoop merged 1 commit into from
Sep 8, 2023
Merged

9.2.x: Proxy Verfier Upgrade to v2.10.1 #10389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion tests/gold_tests/autest-site/conditions.test.ext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ def HasCurlVersion(self, version):


def HasProxyVerifierVersion(self, version):
return self.EnsureVersion(["verifier-client", "--version"], min_version=version)
verifier_path = os.path.join(self.Variables.VerifierBinPath, 'verifier-client')
return self.EnsureVersion([verifier_path, "--version"], min_version=version)


def HasCurlFeature(self, feature):
Expand Down Expand Up @@ -130,6 +131,7 @@ def PluginExists(self, pluginname):


ExtendCondition(HasOpenSSLVersion)
ExtendCondition(HasProxyVerifierVersion)
ExtendCondition(IsBoringSSL)
ExtendCondition(IsOpenSSL)
ExtendCondition(HasATSFeature)
Expand Down
17 changes: 14 additions & 3 deletions tests/prepare_proxy_verifier.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pv_dir="${pv_name}-${pv_version}"
pv_tar_filename="${pv_dir}.tar.gz"
pv_tar="${pv_top_dir}/${pv_tar_filename}"
pv_tar_url="https://ci.trafficserver.apache.org/bintray/${pv_tar_filename}"
expected_sha1="011bd50b74a07484683ed56a671f37afbdd0c786"
expected_sha1="0f189a37596d7488b5b81b5547df6fc1eadf56a1"
pv_client="${bin_dir}/verifier-client"
pv_server="${bin_dir}/verifier-server"
TAR=${TAR:-tar}
Expand Down Expand Up @@ -78,10 +78,10 @@ EOF
Darwin)
case $(uname -m) in
x86_64)
pv_os_dir="${pv_unpack_dir}/${pv_dir}/mac-x86_64"
pv_os_dir="${pv_unpack_dir}/${pv_dir}/darwin-amd64"
;;
arm64)
pv_os_dir="${pv_unpack_dir}/${pv_dir}/mac-m1"
pv_os_dir="${pv_unpack_dir}/${pv_dir}/darwin-arm64"
;;
*)
fail "Unrecognized Mac architecture: $(uname -m)"
Expand All @@ -90,6 +90,17 @@ EOF
;;
Linux)
pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux"
case $(uname -m) in
x86_64)
pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux-amd64"
;;
aarch64)
pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux-arm64"
;;
*)
fail "Unrecognized Linux architecture: $(uname -m)"
;;
esac
;;
*)
fail "We need to build proxy-verifier for $(uname -s)"
Expand Down
2 changes: 1 addition & 1 deletion tests/proxy-verifier-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.6.0
v2.10.1