testing: disable Backup related integration tests (#1422)

* testing: disable Backup related integration tests

Now the environment variable `RUN_SLOW_INTEGRATION_TESTS` indicates
which slow integration tests to run.

Example for running all the slow integration tests:
```sh
RUN_INTEGRATION_TESTS=yes RUN_SLOW_INTEGRATION_TESTS=instance,backup \
  ci/kokoro/docker/build.sh clang-tidy
```

Example for running slow integration tests for instance admin:
```sh
RUN_INTEGRATION_TESTS=yes RUN_SLOW_INTEGRATION_TESTS=instance \
  ci/kokoro/docker/build.sh clang-tidy
```

* fix macos bazel build

Author: Takashi Matsuo

ci/kokoro/docker/build.sh

@@ -24,12 +24,6 @@ export CMAKE_SOURCE_DIR="."
 
 in_docker_script="ci/kokoro/docker/build-in-docker-bazel.sh"
 
-# Set it to "no" for any value other than "yes".
-if [[ "${RUN_SLOW_INTEGRATION_TESTS:-}" != "yes" ]]; then
-  RUN_SLOW_INTEGRATION_TESTS="no"
-fi
-export RUN_SLOW_INTEGRATION_TESTS
-
 if [[ $# -ge 1 ]]; then
   export BUILD_NAME="${1}"
 elif [[ -n "${KOKORO_JOB_NAME:-}" ]]; then
@@ -89,7 +83,10 @@ elif [[ "${BUILD_NAME}" = "coverage" ]]; then
   export DISTRO=fedora-install
   export DISTRO_VERSION=31
   : "${RUN_INTEGRATION_TESTS:=$DEFAULT_RUN_INTEGRATION_TESTS}"
-  export RUN_SLOW_INTEGRATION_TESTS=yes
+  if [[ -z "${RUN_SLOW_INTEGRATION_TESTS:-}" ]]; then
+    # Defaults to "instance" for the coverage test.
+    export RUN_SLOW_INTEGRATION_TESTS=instance
+  fi
   in_docker_script="ci/kokoro/docker/build-in-docker-cmake.sh"
 elif [[ "${BUILD_NAME}" = "publish-refdocs" ]]; then
   export DISTRO=fedora-install

ci/kokoro/macos/build-bazel.sh

@@ -80,7 +80,7 @@ if [[ ${RUN_INTEGRATION_TESTS} == "yes" ]]; then
       "${bazel_args[@]}" \
       "--spawn_strategy=local" \
       "--test_env=GOOGLE_APPLICATION_CREDENTIALS=${GOOGLE_APPLICATION_CREDENTIALS}" \
-      "--test_env=RUN_SLOW_INTEGRATION_TESTS=${RUN_SLOW_INTEGRATION_TESTS}" \
+      "--test_env=RUN_SLOW_INTEGRATION_TESTS=${RUN_SLOW_INTEGRATION_TESTS:-}" \
       "--test_env=GRPC_DEFAULT_SSL_ROOTS_FILE_PATH=${GRPC_DEFAULT_SSL_ROOTS_FILE_PATH}" \
       "--test_env=GOOGLE_CLOUD_PROJECT=${GOOGLE_CLOUD_PROJECT}" \
       "--test_env=GOOGLE_CLOUD_CPP_SPANNER_INSTANCE=${GOOGLE_CLOUD_CPP_SPANNER_INSTANCE}" \

ci/kokoro/macos/build.sh

@@ -20,10 +20,6 @@ export BAZEL_CONFIG=""
 export RUN_INTEGRATION_TESTS="no"
 driver_script="ci/kokoro/macos/build-bazel.sh"
 
-# Set it to "no" for any value other than "yes".
-if [[ "${RUN_SLOW_INTEGRATION_TESTS:-}" != "yes" ]]; then
-  RUN_SLOW_INTEGRATION_TESTS="no"
-fi
 export RUN_SLOW_INTEGRATION_TESTS
 
 if [[ $# -eq 1 ]]; then

google/cloud/spanner/integration_tests/backup_integration_test.cc

@@ -27,6 +27,7 @@
 #include <gmock/gmock.h>
 #include <chrono>
 #include <regex>
+#include <string>
 
 namespace google {
 namespace cloud {
@@ -44,19 +45,21 @@ class BackupTest : public testing::Test {
         google::cloud::internal::GetEnv("SPANNER_EMULATOR_HOST").has_value();
     project_id_ =
         google::cloud::internal::GetEnv("GOOGLE_CLOUD_PROJECT").value_or("");
-    run_slow_integration_tests_ =
-        google::cloud::internal::GetEnv("RUN_SLOW_INTEGRATION_TESTS")
-            .value_or("");
     test_iam_service_account_ =
         google::cloud::internal::GetEnv("GOOGLE_CLOUD_CPP_SPANNER_IAM_TEST_SA")
             .value_or("");
+    auto const run_slow_integration_tests =
+        google::cloud::internal::GetEnv("RUN_SLOW_INTEGRATION_TESTS")
+            .value_or("");
+    run_slow_backup_tests_ =
+        run_slow_integration_tests.find("backup") != std::string::npos;
   }
   InstanceAdminClient instance_admin_client_;
   DatabaseAdminClient database_admin_client_;
   bool emulator_;
   std::string project_id_;
-  std::string run_slow_integration_tests_;
   std::string test_iam_service_account_;
+  bool run_slow_backup_tests_;
 };
 
 class BackupTestWithCleanup : public BackupTest {
@@ -66,7 +69,7 @@ class BackupTestWithCleanup : public BackupTest {
     instance_name_regex_ = std::regex(
         R"(projects/.+/instances/(temporary-instance-(\d{4}-\d{2}-\d{2})-.+))");
     instance_config_regex_ = std::regex(".*us-west.*");
-    if (run_slow_integration_tests_ != "yes") {
+    if (!run_slow_backup_tests_) {
       return;
     }
     // Deletes leaked temporary instances.
@@ -108,7 +111,7 @@ class BackupTestWithCleanup : public BackupTest {
 
 /// @test Backup related integration tests.
 TEST_F(BackupTestWithCleanup, BackupTestSuite) {
-  if (run_slow_integration_tests_ != "yes" || emulator_) {
+  if (!run_slow_backup_tests_ || emulator_) {
     GTEST_SKIP();
   }
 #if !defined(__clang__) && defined(__GNUC__) && \

google/cloud/spanner/integration_tests/database_admin_integration_test.cc

@@ -48,9 +48,6 @@ TEST(DatabaseAdminClient, DatabaseBasicCRUD) {
           .value_or("");
   ASSERT_TRUE(emulator || !test_iam_service_account.empty());
 
-  auto run_slow_integration_tests =
-      google::cloud::internal::GetEnv("RUN_SLOW_INTEGRATION_TESTS")
-          .value_or("");
   Instance const in(project_id, *instance_id);
 
   std::string database_id = spanner_testing::RandomDatabaseName(generator);

google/cloud/spanner/integration_tests/instance_admin_integration_test.cc

@@ -24,6 +24,7 @@
 #include <chrono>
 #include <ctime>
 #include <regex>
+#include <string>
 
 namespace google {
 namespace cloud {
@@ -47,19 +48,21 @@ class InstanceAdminClientTest : public testing::Test {
     instance_id_ =
         google::cloud::internal::GetEnv("GOOGLE_CLOUD_CPP_SPANNER_INSTANCE")
             .value_or("");
-    run_slow_integration_tests_ =
-        google::cloud::internal::GetEnv("RUN_SLOW_INTEGRATION_TESTS")
-            .value_or("");
     test_iam_service_account_ =
         google::cloud::internal::GetEnv("GOOGLE_CLOUD_CPP_SPANNER_IAM_TEST_SA")
             .value_or("");
+    auto const run_slow_integration_tests =
+        google::cloud::internal::GetEnv("RUN_SLOW_INTEGRATION_TESTS")
+            .value_or("");
+    run_slow_instance_tests_ =
+        run_slow_integration_tests.find("instance") != std::string::npos;
   }
   InstanceAdminClient client_;
   bool emulator_;
   std::string project_id_;
   std::string instance_id_;
-  std::string run_slow_integration_tests_;
   std::string test_iam_service_account_;
+  bool run_slow_instance_tests_;
 };
 
 class InstanceAdminClientTestWithCleanup : public InstanceAdminClientTest {
@@ -69,7 +72,7 @@ class InstanceAdminClientTestWithCleanup : public InstanceAdminClientTest {
     instance_name_regex_ = std::regex(
         R"(projects/.+/instances/(temporary-instance-(\d{4}-\d{2}-\d{2})-.+))");
     instance_config_regex_ = std::regex(".*us-west.*");
-    if (run_slow_integration_tests_ != "yes") {
+    if (!run_slow_instance_tests_) {
       return;
     }
     // Deletes leaked temporary instances.
@@ -136,7 +139,7 @@ TEST_F(InstanceAdminClientTest, InstanceReadOperations) {
 
 /// @test Verify the basic CRUD operations for instances work.
 TEST_F(InstanceAdminClientTestWithCleanup, InstanceCRUDOperations) {
-  if (run_slow_integration_tests_ != "yes") {
+  if (!run_slow_instance_tests_) {
     GTEST_SKIP();
   }
   auto generator = google::cloud::internal::MakeDefaultPRNG();
@@ -227,7 +230,7 @@ TEST_F(InstanceAdminClientTest, InstanceIam) {
   ASSERT_STATUS_OK(actual_policy);
   EXPECT_FALSE(actual_policy->etag().empty());
 
-  if (run_slow_integration_tests_ == "yes") {
+  if (run_slow_instance_tests_) {
     // Set the policy to the existing value of the policy. While this changes
     // nothing it tests all the code in the client library.
     auto updated_policy = client_.SetIamPolicy(in, *actual_policy);

google/cloud/spanner/samples/samples.cc

@@ -33,6 +33,7 @@
 #include <chrono>
 #include <regex>
 #include <sstream>
+#include <string>
 #include <tuple>
 #include <utility>
 
@@ -2583,9 +2584,13 @@ int RunOneCommand(std::vector<std::string> argv) {
 }
 
 void RunAll(bool emulator) {
-  auto run_slow_integration_tests =
+  auto const run_slow_integration_tests =
       google::cloud::internal::GetEnv("RUN_SLOW_INTEGRATION_TESTS")
           .value_or("");
+  auto const run_slow_backup_tests =
+      run_slow_integration_tests.find("backup") != std::string::npos;
+  auto const run_slow_instance_tests =
+      run_slow_integration_tests.find("instance") != std::string::npos;
   auto project_id =
       google::cloud::internal::GetEnv("GOOGLE_CLOUD_PROJECT").value_or("");
   if (project_id.empty()) {
@@ -2637,7 +2642,7 @@ void RunAll(bool emulator) {
 
   google::cloud::spanner::DatabaseAdminClient database_admin_client;
 
-  if (run_slow_integration_tests == "yes") {
+  if (run_slow_instance_tests) {
     std::string crud_instance_id =
         google::cloud::spanner_testing::RandomInstanceName(generator);
     std::cout << "\nRunning create-instance sample" << std::endl;
@@ -2655,55 +2660,59 @@ void RunAll(bool emulator) {
                 << std::endl;
       RemoveDatabaseReader(instance_admin_client, project_id, crud_instance_id,
                            "serviceAccount:" + test_iam_service_account);
-      std::string backup_id =
-          google::cloud::spanner_testing::RandomBackupName(generator);
-
-      std::cout << "\nRunning spanner_create_database sample" << std::endl;
-      CreateDatabase(database_admin_client, project_id, crud_instance_id,
-                     database_id);
-
-      std::cout << "\nRunning spanner_create_backup sample" << std::endl;
-      CreateBackup(database_admin_client, project_id, crud_instance_id,
-                   database_id, backup_id);
-
-      std::cout << "\nRunning spanner_get_backup sample" << std::endl;
-      GetBackup(database_admin_client, project_id, crud_instance_id, backup_id);
-
-      std::cout << "\nRunning spanner_update_backup sample" << std::endl;
-      UpdateBackup(database_admin_client, project_id, crud_instance_id,
-                   backup_id);
-
-      std::string restore_database_id =
-          google::cloud::spanner_testing::RandomDatabaseName(generator);
-
-      std::cout << "\nRunning spanner_restore_database sample" << std::endl;
-      RestoreDatabase(database_admin_client, project_id, crud_instance_id,
-                      restore_database_id, backup_id);
-
-      std::cout << "\nRunning spanner_drop_database sample" << std::endl;
-      DropDatabase(database_admin_client, project_id, crud_instance_id,
-                   restore_database_id);
-
-      std::cout << "\nRunning spanner_delete_backup sample" << std::endl;
-      DeleteBackup(database_admin_client, project_id, crud_instance_id,
-                   backup_id);
-
-      std::cout << "\nRunning spanner_cancel_backup_create sample" << std::endl;
-      CreateBackupAndCancel(database_admin_client, project_id, crud_instance_id,
-                            database_id, backup_id);
-
-      std::cout << "\nRunning spanner_list_backup_operations sample"
-                << std::endl;
-      ListBackupOperations(database_admin_client, project_id, crud_instance_id,
-                           database_id);
-
-      std::cout << "\nRunning spanner_list_backups sample" << std::endl;
-      ListBackups(database_admin_client, project_id, crud_instance_id);
-
-      std::cout << "\nRunning spanner_list_database_operations sample"
-                << std::endl;
-      ListDatabaseOperations(database_admin_client, project_id,
-                             crud_instance_id);
+      if (run_slow_backup_tests) {
+        std::string backup_id =
+            google::cloud::spanner_testing::RandomBackupName(generator);
+
+        std::cout << "\nRunning spanner_create_database sample" << std::endl;
+        CreateDatabase(database_admin_client, project_id, crud_instance_id,
+                       database_id);
+
+        std::cout << "\nRunning spanner_create_backup sample" << std::endl;
+        CreateBackup(database_admin_client, project_id, crud_instance_id,
+                     database_id, backup_id);
+
+        std::cout << "\nRunning spanner_get_backup sample" << std::endl;
+        GetBackup(database_admin_client, project_id, crud_instance_id,
+                  backup_id);
+
+        std::cout << "\nRunning spanner_update_backup sample" << std::endl;
+        UpdateBackup(database_admin_client, project_id, crud_instance_id,
+                     backup_id);
+
+        std::string restore_database_id =
+            google::cloud::spanner_testing::RandomDatabaseName(generator);
+
+        std::cout << "\nRunning spanner_restore_database sample" << std::endl;
+        RestoreDatabase(database_admin_client, project_id, crud_instance_id,
+                        restore_database_id, backup_id);
+
+        std::cout << "\nRunning spanner_drop_database sample" << std::endl;
+        DropDatabase(database_admin_client, project_id, crud_instance_id,
+                     restore_database_id);
+
+        std::cout << "\nRunning spanner_delete_backup sample" << std::endl;
+        DeleteBackup(database_admin_client, project_id, crud_instance_id,
+                     backup_id);
+
+        std::cout << "\nRunning spanner_cancel_backup_create sample"
+                  << std::endl;
+        CreateBackupAndCancel(database_admin_client, project_id,
+                              crud_instance_id, database_id, backup_id);
+
+        std::cout << "\nRunning spanner_list_backup_operations sample"
+                  << std::endl;
+        ListBackupOperations(database_admin_client, project_id,
+                             crud_instance_id, database_id);
+
+        std::cout << "\nRunning spanner_list_backups sample" << std::endl;
+        ListBackups(database_admin_client, project_id, crud_instance_id);
+
+        std::cout << "\nRunning spanner_list_database_operations sample"
+                  << std::endl;
+        ListDatabaseOperations(database_admin_client, project_id,
+                               crud_instance_id);
+      }
     }
 
     std::cout << "\nRunning delete-instance sample" << std::endl;