Skip to content
Merged
6 changes: 3 additions & 3 deletions .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ branchProtectionRules:
- "units (11)"
- "Kokoro - Test: Integration"
- "cla/google"
- 'Kokoro - Test: Java GraalVM Native Image'
- 'Kokoro - Test: Java 17 GraalVM Native Image'
- javadoc
- 'Kokoro - Test: Java GraalVM Native Image A'
- 'Kokoro - Test: Java GraalVM Native Image B'
- 'Kokoro - Test: Java GraalVM Native Image C'
- unmanaged_dependency_check
# Identifies the protection rule pattern. Name of the branch to be protected.
# Defaults to `main`
Expand Down
7 changes: 1 addition & 6 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fi
# Start the Spanner emulator if the environment variable for it has been set.
# TODO: Change if statement once the env var can be set in the config.
#if [[ ! -z "${SPANNER_EMULATOR_HOST}" ]]; then
if [[ "$JOB_TYPE" == "graalvm" ]] || [[ "$JOB_TYPE" == "graalvm17" ]]; then
if [[ "$JOB_TYPE" == "graalvm" ]]; then
echo "Starting emulator"
export SPANNER_EMULATOR_HOST=localhost:9010
docker pull gcr.io/cloud-spanner-emulator/emulator
Expand Down Expand Up @@ -115,11 +115,6 @@ graalvm)
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
RETURN_CODE=$?
;;
graalvm17)
# Run Unit and Integration Tests with Native Image.
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
RETURN_CODE=$?
;;
samples)
SAMPLES_DIR=samples
# only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.0"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2"
}

env_vars: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.0"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2"
}

env_vars: {
key: "JOB_TYPE"
value: "graalvm17"
value: "graalvm"
}

# TODO: remove this after we've migrated all tests and scripts
Expand Down
33 changes: 33 additions & 0 deletions .kokoro/presubmit/graalvm-native-c.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2"
}

env_vars: {
key: "JOB_TYPE"
value: "graalvm"
}

# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_CLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-it-service-account"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
}
Loading