diff --git a/.agents/skills/verify-local-changes/SKILL.md b/.agents/skills/verify-local-changes/SKILL.md index 02db50857a..a7eb01cb3d 100644 --- a/.agents/skills/verify-local-changes/SKILL.md +++ b/.agents/skills/verify-local-changes/SKILL.md @@ -47,7 +47,7 @@ When running integration tests, configure your execution using properties or env - `standard` (Default) - `enterprise` - *Note*: **Pipelines can only be run against `enterprise` editions**, while standard Queries run on both. -- **`FIRESTORE_NAMED_DATABASE`**: +- **`FIRESTORE_DATABASE_ID`**: - Enterprise editions usually require a named database (often `enterprise`). Adjust this flag if pointing to specific instances. - **`FIRESTORE_TARGET_BACKEND`**: - `PROD` (Default) @@ -58,15 +58,13 @@ When running integration tests, configure your execution using properties or env 1. **Identify modified integration tests** (usually Starting in `IT`). 2. **Run specific integration tests only** (isolated checks run quicker): ```bash - mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dtest=ITTest#testMethod -Dclirr.skip=true -Denforcer.skip=true -fae + mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_DATABASE_ID=enterprise -Dtest=ITTest#testMethod -Dclirr.skip=true -Denforcer.skip=true -fae ``` 3. **Run the entire integration test suite** for the modified class if isolation tests pass: ```bash - mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dtest=ITTest -Dclirr.skip=true -Denforcer.skip=true -fae + mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_DATABASE_ID=enterprise -Dtest=ITTest -Dclirr.skip=true -Denforcer.skip=true -fae ``` - - --- ## Step 3: Full Suite Regressions @@ -74,7 +72,7 @@ When running integration tests, configure your execution using properties or env Run the full integration regression suite once you are confident subsets pass: ```bash -mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dclirr.skip=true -Denforcer.skip=true -fae +mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_DATABASE_ID=enterprise -Dclirr.skip=true -Denforcer.skip=true -fae ``` --- @@ -89,7 +87,7 @@ mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE If you run into issues executing tests with the commands above, **consult the Kokoro configuration files** as the ultimate source of truth: - **Presubmit configurations**: See `.kokoro/presubmit/integration.cfg` (or `integration-named-db.cfg`) -- **Nightly configurations**: See `.kokoro/nightly/integration.cfg` +- **Nightly configurations**: See `.kokoro/nightly/integration.cfg` (or `integration-named-db.cfg`) - **Build shell scripts**: See `.kokoro/build.sh` These files define the exact environment variables (e.g., specific endpoints or endpoints overrides) the CI server uses! diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml index 47b9e87c98..8c922936b9 100644 --- a/.github/workflows/renovate_config_check.yaml +++ b/.github/workflows/renovate_config_check.yaml @@ -4,6 +4,7 @@ on: pull_request: paths: - 'renovate.json' + - '.github/workflows/renovate_config_check.yaml' jobs: renovate_bot_config_validation: @@ -18,8 +19,6 @@ jobs: with: node-version: '22' - - name: Install Renovate and Config Validator + - name: Run Renovate Config Validator run: | - npm install -g npm@latest - npm install --global renovate - renovate-config-validator + npx --package renovate@43.136.0 renovate-config-validator diff --git a/.kokoro/nightly/integration-named-db.cfg b/.kokoro/nightly/integration-named-db.cfg index 1d3f31f63e..b1eb8c5800 100644 --- a/.kokoro/nightly/integration-named-db.cfg +++ b/.kokoro/nightly/integration-named-db.cfg @@ -13,7 +13,7 @@ env_vars: { env_vars: { key: "INTEGRATION_TEST_ARGS" - value: "-DFIRESTORE_NAMED_DATABASE=test-db -DFIRESTORE_EDITION=standard" + value: "-DFIRESTORE_DATABASE_ID=test-db -DFIRESTORE_EDITION=standard" } # TODO: remove this after we've migrated all tests and scripts diff --git a/.kokoro/presubmit/graalvm-c.cfg b/.kokoro/presubmit/graalvm-c.cfg index 654995133b..fd2266d01a 100644 --- a/.kokoro/presubmit/graalvm-c.cfg +++ b/.kokoro/presubmit/graalvm-c.cfg @@ -13,7 +13,7 @@ env_vars: { env_vars: { key: "INTEGRATION_TEST_ARGS" - value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise" + value: "-DFIRESTORE_DATABASE_ID=enterprise -DFIRESTORE_EDITION=enterprise" } # TODO: remove this after we've migrated all tests and scripts diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index b55e211704..6f7b5bf311 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -13,7 +13,7 @@ env_vars: { env_vars: { key: "INTEGRATION_TEST_ARGS" - value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise" + value: "-DFIRESTORE_DATABASE_ID=enterprise -DFIRESTORE_EDITION=enterprise" } env_vars: { diff --git a/.kokoro/presubmit/integration-named-db.cfg b/.kokoro/presubmit/integration-named-db.cfg index 43dac3fac3..f79b998d24 100644 --- a/.kokoro/presubmit/integration-named-db.cfg +++ b/.kokoro/presubmit/integration-named-db.cfg @@ -13,7 +13,7 @@ env_vars: { env_vars: { key: "INTEGRATION_TEST_ARGS" - value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise" + value: "-DFIRESTORE_DATABASE_ID=enterprise -DFIRESTORE_EDITION=enterprise" } env_vars: { diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITBaseTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITBaseTest.java index 725bb2cf08..2261b3cf19 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITBaseTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITBaseTest.java @@ -82,7 +82,7 @@ static FirestoreEdition getFirestoreEdition() { public static FirestoreOptions.Builder getOptionsBuilder() { FirestoreOptions.Builder optionsBuilder = FirestoreOptions.newBuilder(); - String dbPropertyName = "FIRESTORE_NAMED_DATABASE"; + String dbPropertyName = "FIRESTORE_DATABASE_ID"; String namedDb = System.getProperty(dbPropertyName); if (namedDb == null) { namedDb = System.getenv(dbPropertyName); diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java index 8f41c627f9..1ebdae3dee 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java @@ -327,7 +327,7 @@ public void before() throws Exception { .build()); } - String namedDb = System.getProperty("FIRESTORE_NAMED_DATABASE"); + String namedDb = System.getProperty("FIRESTORE_DATABASE_ID"); if (namedDb != null) { logger.log(Level.INFO, "Integration test using named database " + namedDb); optionsBuilder = optionsBuilder.setDatabaseId(namedDb); diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITTracingTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITTracingTest.java index be4ef4485d..0b2f90e1b6 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITTracingTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITTracingTest.java @@ -135,7 +135,7 @@ public void before() { otelOptionsBuilder.setOpenTelemetry(openTelemetrySdk).build()); } - String namedDb = System.getProperty("FIRESTORE_NAMED_DATABASE"); + String namedDb = System.getProperty("FIRESTORE_DATABASE_ID"); if (namedDb != null) { logger.log( Level.INFO,