From 77cbe7928205bd36b6fe50cc10b95e3086f06732 Mon Sep 17 00:00:00 2001
From: Scott Hart <sdhart@google.com>
Date: Fri, 22 Nov 2024 17:14:30 -0500
Subject: [PATCH]  ci: update cmake quickstart handling for storage grpc
 (#14856)

---
 ci/cloudbuild/builds/cmake-install.sh | 12 ++----------
 ci/verify_quickstart/CMakeLists.txt   |  6 +++++-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ci/cloudbuild/builds/cmake-install.sh b/ci/cloudbuild/builds/cmake-install.sh
index 98ad088f2dfc1..306575c7493e8 100755
--- a/ci/cloudbuild/builds/cmake-install.sh
+++ b/ci/cloudbuild/builds/cmake-install.sh
@@ -213,10 +213,10 @@ io::log_h1 "Build and run quickstarts"
 # Tests the installed artifacts by building and running the quickstarts.
 # shellcheck disable=SC2046
 feature_list="$(printf "%s;" $(features::libraries))"
-# GCS+gRPC and OpenTelemetry also have quickstarts.
+# OpenTelemetry also has a quickstart.
 feature_list="${feature_list}opentelemetry"
 
-io::log_h2 "Most features"
+io::log_h2 "All features"
 cmake -G Ninja \
   -S "${PROJECT_ROOT}/ci/verify_quickstart" \
   -B "${PROJECT_ROOT}/cmake-out/quickstart" \
@@ -224,14 +224,6 @@ cmake -G Ninja \
   "-DFEATURES=${feature_list}"
 cmake --build "${PROJECT_ROOT}/cmake-out/quickstart"
 
-io::log_h2 "GCS+gRPC"
-cmake -G Ninja \
-  -S "${PROJECT_ROOT}/ci/verify_quickstart" \
-  -B "${PROJECT_ROOT}/cmake-out/quickstart" \
-  "-DCMAKE_PREFIX_PATH=${INSTALL_PREFIX}" \
-  "-DFEATURES=storage_grpc"
-cmake --build "${PROJECT_ROOT}/cmake-out/quickstart"
-
 io::log_h2 "Delete installed artifacts and run compiled quickstarts"
 # Deletes all the installed artifacts, and installs only the runtime components
 # to verify that we can still execute the compiled quickstart programs.
diff --git a/ci/verify_quickstart/CMakeLists.txt b/ci/verify_quickstart/CMakeLists.txt
index 0a11ce9fc3868..47540b884a93d 100644
--- a/ci/verify_quickstart/CMakeLists.txt
+++ b/ci/verify_quickstart/CMakeLists.txt
@@ -100,7 +100,11 @@ function (add_make_quickstart_target feature library target)
 endfunction ()
 
 foreach (feature IN LISTS FEATURES)
-    if ("${feature}" STREQUAL "storage_grpc")
+    # Regardless of whether "-" or "_" is used for storage+grpc, its quickstart
+    # does not follow the usual convention for feature to quickstart naming nor
+    # location.
+    if ("${feature}" STREQUAL "storage-grpc" OR "${feature}" STREQUAL
+                                                "storage_grpc")
         add_cmake_quickstart_target("${feature}" storage quickstart_grpc)
         add_make_quickstart_target("${feature}" storage quickstart_grpc)
         continue()