-
Notifications
You must be signed in to change notification settings - Fork 325
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cleanup firestore ci test resource (#2322)
With feature in [#2164](#2164), now Firestore can run in same project as datastore. This PR cleans up settings for integration tests ci so that tests for Firestore module and samples run in the same ci project as the rest. Modules affected in this change: - autoconfigure/firestore - data-firestore - data-firestore-sample - starter-firestore-sample Before this change, these modules are setup to run with `spring-cloud-gcp-ci-firestore` project. After this change: - database-id=firestoredb is specified for above module's tests. - does not specify `firestore.project-id` and get project id info from `DefaultGcpProjectIdProvider`. For integration test ci, it is `spring-cloud-gcp-ci` set via gcloud [here](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/blob/ef30225e60e270f8cc1a9213728f0cfdd7e4de50/.github/workflows/integrationTests.yaml#L51).
- Loading branch information
Showing
5 changed files
with
48 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
spring-cloud-gcp-data-firestore/src/test/resources/application-test.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
test.integration.firestore.project-id=spring-cloud-gcp-ci-firestore | ||
test.integration.firestore.database-id=firestoredb |
1 change: 0 additions & 1 deletion
1
...les/spring-cloud-gcp-data-firestore-sample/src/test/resources/application-test.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
spring.cloud.gcp.firestore.project-id=spring-cloud-gcp-ci | ||
spring.cloud.gcp.firestore.database-id=firestoredb |
2 changes: 1 addition & 1 deletion
2
.../spring-cloud-gcp-starter-firestore-sample/src/test/resources/application-test.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
spring.cloud.gcp.firestore.project-id=spring-cloud-gcp-ci-firestore | ||
spring.cloud.gcp.firestore.database-id=firestoredb |