chore: SQL testing cleanup (#2189)

Followup from: #2185.
GoogleCloudPlatform · Sep 20, 2023 · dce3f11 · dce3f11
1 parent 1dea22e
commit dce3f11
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/integrationTests.yaml b/.github/workflows/integrationTests.yaml
@@ -108,6 +108,7 @@ jobs:
             --define maven.javadoc.skip=true \
             --define skip.surefire.tests=true \
             --define "spring.datasource.password=${DB_PASSWORD}" \
+            --define "spring.r2dbc.password=${DB_PASSWORD}" \
             --define it.${{ matrix.it }}=true \
             verify
         env:
@@ -122,6 +123,7 @@ jobs:
             --define maven.javadoc.skip=true \
             --define skip.surefire.tests=true \
             --define "spring.datasource.password=${DB_PASSWORD}" \
+            --define "spring.r2dbc.password=${DB_PASSWORD}" \
             --define it.${{ matrix.it }}=true \
             verify
         env:

diff --git a/spring-cloud-gcp-samples/pom.xml b/spring-cloud-gcp-samples/pom.xml
@@ -166,8 +166,6 @@
 								<gcs-local-directory>/tmp/gcp_integration_tests/integration_storage_sample</gcs-local-directory>
 								<spring.cloud.gcp.sql.instance-connection-name>spring-cloud-gcp-ci:us-central1:testmysql</spring.cloud.gcp.sql.instance-connection-name>
 								<spring.cloud.gcp.sql.database-name>code_samples_test_db</spring.cloud.gcp.sql.database-name>
-								<spring.datasource.password>test</spring.datasource.password>
-								<spring.r2dbc.password>test</spring.r2dbc.password>
 							</systemPropertyVariables>
 						</configuration>
 					</plugin>

diff --git a/...stgres-sample/src/test/java/com/example/SqlPostgresSampleApplicationIntegrationTests.java b/...stgres-sample/src/test/java/com/example/SqlPostgresSampleApplicationIntegrationTests.java
@@ -44,7 +44,6 @@
       "spring.cloud.gcp.sql.database-name=code_samples_test_db",
       "spring.cloud.gcp.sql.instance-connection-name=spring-cloud-gcp-ci:us-central1:testpostgres",
       "spring.datasource.username=postgres",
-      "spring.datasource.password=test",
       "spring.datasource.continue-on-error=true",
       "spring.sql.init.mode=always"
     })