ci: separate out storage emulator from cxx20 builds (googleapis#16167)

Author: scotthart

ci/cloudbuild/builds/clang-cxx20.sh

@@ -40,4 +40,10 @@ io::run cmake --build cmake-out
 mapfile -t ctest_args < <(ctest::common_args)
 io::run env -C cmake-out ctest "${ctest_args[@]}" -LE "integration-test"
 
-integration::ctest_with_emulators "cmake-out"
+if [[ "${INTEGRATION_LIBRARIES:-}" == "storage" ]]; then
+  integration::ctest_storage_with_emulators "cmake-out"
+elif [[ "${INTEGRATION_LIBRARIES:-}" == "all_bar_storage" ]]; then
+  integration::ctest_with_emulators "cmake-out" "storage"
+else
+  integration::ctest_with_emulators "cmake-out"
+fi

ci/cloudbuild/builds/cxx20.sh

@@ -40,4 +40,10 @@ io::run cmake --build cmake-out
 mapfile -t ctest_args < <(ctest::common_args)
 io::run env -C cmake-out ctest "${ctest_args[@]}" -LE "integration-test"
 
-integration::ctest_with_emulators "cmake-out"
+if [[ "${INTEGRATION_LIBRARIES:-}" == "storage" ]]; then
+  integration::ctest_storage_with_emulators "cmake-out"
+elif [[ "${INTEGRATION_LIBRARIES:-}" == "all_bar_storage" ]]; then
+  integration::ctest_with_emulators "cmake-out" "storage"
+else
+  integration::ctest_with_emulators "cmake-out"
+fi

ci/cloudbuild/builds/lib/integration.sh

@@ -428,7 +428,7 @@ function integration::bazel_with_emulators() {
 #   integration::ctest_with_emulators "cmake-out"
 #
 function integration::ctest_with_emulators() {
-  readonly EMULATOR_SCRIPT="run_integration_tests_emulator_cmake.sh"
+  local -r EMULATOR_SCRIPT="run_integration_tests_emulator_cmake.sh"
   if [[ $# == 0 ]]; then
     io::log_red "error: build output directory required"
     return 1
@@ -446,9 +446,11 @@ function integration::ctest_with_emulators() {
   "google/cloud/pubsub/ci/${EMULATOR_SCRIPT}" \
     "${cmake_out}" "${ctest_args[@]}" -L integration-test-emulator
 
-  io::log_h2 "Running Storage integration tests (with emulator)"
-  "${PROJECT_ROOT}/google/cloud/storage/ci/${EMULATOR_SCRIPT}" \
-    "${cmake_out}" "${ctest_args[@]}" -L integration-test-emulator
+  if ! [[ "${skip_args[*]}" =~ "storage" ]]; then
+    io::log_h2 "Running Storage integration tests (with emulator)"
+    "${PROJECT_ROOT}/google/cloud/storage/ci/${EMULATOR_SCRIPT}" \
+      "${cmake_out}" "${ctest_args[@]}" -L integration-test-emulator
+  fi
 
   if ! [[ "${skip_args[*]}" =~ "spanner" ]]; then
     io::log_h2 "Running Spanner integration tests (with emulator)"
@@ -464,3 +466,24 @@ function integration::ctest_with_emulators() {
   "google/cloud/internal/ci/${EMULATOR_SCRIPT}" \
     "${cmake_out}" "${ctest_args[@]}" -L integration-test-emulator
 }
+
+# Runs Storage integration tests with CTest using emulators.
+function integration::ctest_storage_with_emulators() {
+  local -r EMULATOR_SCRIPT="run_integration_tests_emulator_cmake.sh"
+  if [[ $# == 0 ]]; then
+    io::log_red "error: build output directory required"
+    return 1
+  fi
+
+  local cmake_out="$1"
+
+  local -a ctest_args
+  mapfile -t ctest_args < <(ctest::common_args)
+  # Integration tests are inherently flaky. Make up to three attempts to get the
+  # test passing.
+  ctest_args+=(--repeat until-pass:3)
+
+  io::log_h2 "Running Storage integration tests (with emulator)"
+  "${PROJECT_ROOT}/google/cloud/storage/ci/${EMULATOR_SCRIPT}" \
+    "${cmake_out}" "${ctest_args[@]}" -L integration-test-emulator
+}

ci/cloudbuild/triggers/cxx20-ci.yaml

@@ -23,6 +23,7 @@ name: cxx20-ci
 substitutions:
   _BUILD_NAME: cxx20
   _DISTRO: fedora-latest-cxx20
+  _INTEGRATION_LIBRARIES: all_bar_storage
   _TRIGGER_TYPE: ci
 tags:
 - ci

ci/cloudbuild/triggers/cxx20-pr.yaml

@@ -24,6 +24,7 @@ name: cxx20-pr
 substitutions:
   _BUILD_NAME: cxx20
   _DISTRO: fedora-latest-cxx20
+  _INTEGRATION_LIBRARIES: all_bar_storage
   _TRIGGER_TYPE: pr
 tags:
 - pr

ci/cloudbuild/triggers/cxx20-storage-ci.yaml

@@ -0,0 +1,29 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+filename: ci/cloudbuild/cloudbuild.yaml
+github:
+  name: google-cloud-cpp
+  owner: googleapis
+  push:
+    branch: main
+includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
+name: cxx20-storage-ci
+substitutions:
+  _BUILD_NAME: cxx20
+  _DISTRO: fedora-latest-cxx20
+  _INTEGRATION_LIBRARIES: storage
+  _TRIGGER_TYPE: ci
+tags:
+- ci

ci/cloudbuild/triggers/cxx20-storage-pr.yaml

@@ -0,0 +1,30 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+filename: ci/cloudbuild/cloudbuild.yaml
+github:
+  name: google-cloud-cpp
+  owner: googleapis
+  pullRequest:
+    branch: main
+    commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
+includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
+name: cxx20-storage-pr
+substitutions:
+  _BUILD_NAME: cxx20
+  _DISTRO: fedora-latest-cxx20
+  _INTEGRATION_LIBRARIES: storage
+  _TRIGGER_TYPE: pr
+tags:
+- pr