Skip to content

Commit b9d7e39

Browse files
scotthartscotthart
authored
ci(spanner): graph samples to use enterprise instances (#14757)
1 parent a344180 commit b9d7e39

4 files changed

Lines changed: 13 additions & 12 deletions

File tree

‎google/cloud/spanner/admin/integration_tests/backup_extra_integration_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ TEST_F(BackupExtraIntegrationTest, CreateBackupWithVersionTime) {
288288

289289
/// @test Verify creating a backup with an expired version_time fails.
290290
TEST_F(BackupExtraIntegrationTest, CreateBackupWithExpiredVersionTime) {
291-
auto instance_id =
292-
spanner_testing::PickRandomInstance(generator_, ProjectId());
291+
auto instance_id = spanner_testing::PickRandomInstance(
292+
generator_, ProjectId(), "NOT labels.edition:enterprise");
293293
ASSERT_THAT(instance_id, IsOk());
294294
Instance in(ProjectId(), *instance_id);
295295
Database db(in, spanner_testing::RandomDatabaseName(generator_));
@@ -333,8 +333,8 @@ TEST_F(BackupExtraIntegrationTest, CreateBackupWithExpiredVersionTime) {
333333

334334
/// @test Verify creating a backup with a future version_time fails.
335335
TEST_F(BackupExtraIntegrationTest, CreateBackupWithFutureVersionTime) {
336-
auto instance_id =
337-
spanner_testing::PickRandomInstance(generator_, ProjectId());
336+
auto instance_id = spanner_testing::PickRandomInstance(
337+
generator_, ProjectId(), "NOT labels.edition:enterprise");
338338
ASSERT_THAT(instance_id, IsOk());
339339
Instance in(ProjectId(), *instance_id);
340340
Database db(in, spanner_testing::RandomDatabaseName(generator_));

‎google/cloud/spanner/integration_tests/backup_extra_integration_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ TEST_F(BackupExtraIntegrationTest, BackupRestoreWithVersionTime) {
236236

237237
/// @test Verify creating a backup with an expired version_time fails.
238238
TEST_F(BackupExtraIntegrationTest, BackupWithExpiredVersionTime) {
239-
auto instance_id =
240-
spanner_testing::PickRandomInstance(generator_, ProjectId());
239+
auto instance_id = spanner_testing::PickRandomInstance(
240+
generator_, ProjectId(), "NOT labels.edition:enterprise");
241241
ASSERT_THAT(instance_id, IsOk());
242242
Instance in(ProjectId(), *instance_id);
243243
Database db(in, spanner_testing::RandomDatabaseName(generator_));
@@ -273,8 +273,8 @@ TEST_F(BackupExtraIntegrationTest, BackupWithExpiredVersionTime) {
273273

274274
/// @test Verify creating a backup with a future version_time fails.
275275
TEST_F(BackupExtraIntegrationTest, BackupWithFutureVersionTime) {
276-
auto instance_id =
277-
spanner_testing::PickRandomInstance(generator_, ProjectId());
276+
auto instance_id = spanner_testing::PickRandomInstance(
277+
generator_, ProjectId(), "NOT labels.edition:enterprise");
278278
ASSERT_THAT(instance_id, IsOk());
279279
Instance in(ProjectId(), *instance_id);
280280
Database db(in, spanner_testing::RandomDatabaseName(generator_));

‎google/cloud/spanner/samples/graph_samples.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,7 @@ int RunAll(bool emulator) {
521521
}
522522

523523
auto random_instance = google::cloud::spanner_testing::PickRandomInstance(
524-
generator, project_id,
525-
"labels.samples:yes AND NOT name:/instances/test-instance-mr-");
524+
generator, project_id, "labels.edition:enterprise");
526525
if (!random_instance) {
527526
throw std::runtime_error("Cannot find an instance to run the samples: " +
528527
random_instance.status().message());

‎google/cloud/spanner/testing/database_integration_test.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ void DatabaseIntegrationTest::SetUpTestSuite() {
4848

4949
auto project_id = internal::GetEnv("GOOGLE_CLOUD_PROJECT").value_or("");
5050
ASSERT_FALSE(project_id.empty());
51-
auto instance_id = PickRandomInstance(*generator_, project_id);
51+
auto instance_id = PickRandomInstance(*generator_, project_id,
52+
"NOT labels.edition:enterprise");
5253
ASSERT_THAT(instance_id, IsOk());
5354
auto database_id = RandomDatabaseName(*generator_);
5455
db_ = new spanner::Database(project_id, *instance_id, database_id);
@@ -198,7 +199,8 @@ void PgDatabaseIntegrationTest::SetUpTestSuite() {
198199

199200
auto project_id = internal::GetEnv("GOOGLE_CLOUD_PROJECT").value_or("");
200201
ASSERT_FALSE(project_id.empty());
201-
auto instance_id = PickRandomInstance(*generator_, project_id);
202+
auto instance_id = PickRandomInstance(*generator_, project_id,
203+
"NOT labels.edition:enterprise");
202204
ASSERT_THAT(instance_id, IsOk());
203205
auto database_id = RandomDatabaseName(*generator_);
204206
db_ = new spanner::Database(project_id, *instance_id, database_id);

0 commit comments

Comments
 (0)