(trafficserver) branch master updated: Updates for new build_h3_tools for quiche on openssl (#11318)

[bneradt]

This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 4e6a52f5be Updates for new build_h3_tools for quiche on openssl 
(#11318)
4e6a52f5be is described below

commit 4e6a52f5be744d0d472968f2db19f6a1f4105194
Author: Brian Neradt <brian.ner...@gmail.com>
AuthorDate: Fri May 3 17:02:18 2024 -0500

    Updates for new build_h3_tools for quiche on openssl (#11318)
    
    The rockylinux:8 and fedora:40 CI images now both have the updated
    build_h3_tools run on them. I kept the openssl-quic in /opt for parity
    with current CI tooling and the boringssl satck is in
    /opt/h3-tools-boringssl. This updates the presets for these new paths.
---
 CMakePresets.json | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index 4030088ca4..426ef71915 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -147,11 +147,10 @@
       "description": "CI Pipeline config for Rocky Linux",
       "inherits": ["ci"],
       "cacheVariables": {
-        "OPENSSL_ROOT_DIR": "/opt/boringssl",
-        "quiche_ROOT": "/opt/quiche",
+        "OPENSSL_ROOT_DIR": "/opt/h3-tools-boringssl/boringssl",
+        "quiche_ROOT": "/opt/h3-tools-boringssl/quiche",
         "CMAKE_INSTALL_PREFIX": "/tmp/ats-quiche",
         "opentelemetry_ROOT": "/opt",
-        "CURL_ROOT": "/opt",
         "ENABLE_QUICHE": "ON"
       }
     },
@@ -187,8 +186,8 @@
       "description": "CI Pipeline config for Fedora Linux (quiche build)",
       "inherits": ["ci"],
       "cacheVariables": {
-        "OPENSSL_ROOT_DIR": "/opt/boringssl",
-        "quiche_ROOT": "/opt/quiche",
+        "OPENSSL_ROOT_DIR": "/opt/h3-tools-boringssl/boringssl",
+        "quiche_ROOT": "/opt/h3-tools-boringssl/quiche",
         "opentelemetry_ROOT": "/opt",
         "CURL_ROOT": "/opt",
         "wamr_ROOT": "/opt",
@@ -300,13 +299,25 @@
       }
     },
     {
-      "name": "branch-quiche",
+      "name": "branch-quiche-on-boringssl",
+      "displayName": "CI branch Quiche",
+      "inherits": ["branch"],
+      "cacheVariables": {
+        "ENABLE_AUTEST": "ON",
+        "nuraft_ROOT": "/opt/nuraft-boringssl",
+        "OPENSSL_ROOT_DIR": "/opt/h3-tools-boringssl/boringssl",
+        "quiche_ROOT": "/opt/h3-tools-boringssl/quiche",
+        "ENABLE_QUICHE": "ON"
+      }
+    },
+    {
+      "name": "branch-quiche-on-openssl",
       "displayName": "CI branch Quiche",
       "inherits": ["branch"],
       "cacheVariables": {
         "ENABLE_AUTEST": "ON",
         "nuraft_ROOT": "/opt/nuraft-boringssl",
-        "OPENSSL_ROOT_DIR": "/opt/boringssl",
+        "OPENSSL_ROOT_DIR": "/opt/openssl-quic/",
         "quiche_ROOT": "/opt/quiche",
         "ENABLE_QUICHE": "ON"
       }