cleanup

Author: scotthart

ci/cloudbuild/builds/lib/integration.sh

@@ -323,7 +323,7 @@ function integration::ctest_with_emulators() {
   "${PROJECT_ROOT}/google/cloud/storage/ci/${EMULATOR_SCRIPT}" \
     "${cmake_out}" "${ctest_args[@]}" -L integration-test-emulator
 
-  if ! [[ "${skip_args[*]}" =~ "spanner" ]]; then
+  if ! [[ "${skip_args[*]}" =~ " spanner " ]]; then
     io::log_h2 "Running Spanner integration tests (with emulator)"
     "${PROJECT_ROOT}/google/cloud/spanner/ci/${EMULATOR_SCRIPT}" \
       "${cmake_out}" "${ctest_args[@]}" -L integration-test-emulator

ci/cloudbuild/dockerfiles/ubuntu-22.04.Dockerfile

@@ -26,7 +26,6 @@ RUN apt-get update && \
         git \
         gcc \
         g++ \
-        cmake \
         libcurl4-openssl-dev \
         libssl-dev \
         libtool \