From 47f60190a92f4d406d17c7ef53e61816071128c1 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 4 Dec 2024 14:34:20 +0100 Subject: [PATCH 1/2] .github: fix test_certauthority_root in 4.19 (#10037) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d369916f712..f561faa1fc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -220,9 +220,9 @@ jobs: cache: maven - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.10' architecture: 'x64' - name: Install Build Dependencies From 971a5b25ec3a515fdc2513612a8a310224ab2461 Mon Sep 17 00:00:00 2001 From: dahn Date: Fri, 6 Dec 2024 14:46:17 +0100 Subject: [PATCH 2/2] Remove SNI option that is correct as default in _run.sh (#10028) --- systemvm/agent/scripts/_run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemvm/agent/scripts/_run.sh b/systemvm/agent/scripts/_run.sh index 1b473f64ebf..11158ecf5bd 100755 --- a/systemvm/agent/scripts/_run.sh +++ b/systemvm/agent/scripts/_run.sh @@ -60,4 +60,4 @@ if [ "$(uname -m | grep '64')" == "" ]; then fi fi -java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Djdk.tls.ephemeralDHKeySize=2048 -Djsse.enableSNIExtension=false -Dlog.home=$LOGHOME -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@ +java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Djdk.tls.ephemeralDHKeySize=2048 -Dlog.home=$LOGHOME -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@