Skip to content

Commit 3e4152d

Browse files
chore: start emulator on all graalvm jobs
1 parent 1f32d02 commit 3e4152d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.kokoro/build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fi
4545
# Start the Spanner emulator if the environment variable for it has been set.
4646
# TODO: Change if statement once the env var can be set in the config.
4747
#if [[ ! -z "${SPANNER_EMULATOR_HOST}" ]]; then
48-
if [[ "$JOB_TYPE" == "graalvm" ]]; then
48+
if [[ "$JOB_TYPE" =~ ^graalvm ]]; then
4949
echo "Starting emulator"
5050
export SPANNER_EMULATOR_HOST=localhost:9010
5151
docker pull gcr.io/cloud-spanner-emulator/emulator
@@ -117,7 +117,8 @@ graalvm)
117117
;;
118118
graalvmA)
119119
# Run Unit and Integration Tests with Native Image A.
120-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
120+
121+
NATIVE_IMAGE_OPTIONS="--strict-image-heap" mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
121122
RETURN_CODE=$?
122123
;;
123124
samples)

src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\
1616
org.junit.FixMethodOrder,\
1717
org.junit.experimental.categories.Category,\
1818
org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters,\
19-
org.junit.runners.model.FrameworkField,\
19+
org.junit.runners.model.FrameworkField,\
20+
# com.google.common.math.IntMath,\
21+
# com.google.cloud.ServiceOptions,\
22+
# com.google.cloud.spanner.SpannerOptions,\
23+
# io.grpc.Context,\

0 commit comments

Comments
 (0)