Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,15 @@ integration)
;;
graalvmA)
# Run Unit and Integration Tests with Native Image
bash .kokoro/populate-secrets.sh
export GOOGLE_APPLICATION_CREDENTIALS="${KOKORO_GFILE_DIR}/secret_manager/java-it-service-account"
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
RETURN_CODE=$?
;;
graalvmB)
# Run Unit and Integration Tests with Native Image
bash .kokoro/populate-secrets.sh
export GOOGLE_APPLICATION_CREDENTIALS="${KOKORO_GFILE_DIR}/secret_manager/java-it-service-account"
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
RETURN_CODE=$?
;;
Expand Down
18 changes: 12 additions & 6 deletions .kokoro/populate-secrets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,19 @@ mkdir -p ${SECRET_LOCATION}
for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g")
do
msg "Retrieving secret ${key}"
docker run --entrypoint=gcloud \
--volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
gcr.io/google.com/cloudsdktool/cloud-sdk \
secrets versions access latest \
if [[ "${JOB_TYPE}" == *"graalvm"* ]]; then
gcloud secrets versions access latest \
--project cloud-devrel-kokoro-resources \
--secret ${key} > \
"${SECRET_LOCATION}/${key}"
--secret ${key} > "${SECRET_LOCATION}/${key}"
else
docker run --entrypoint=gcloud \
--volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
gcr.io/google.com/cloudsdktool/cloud-sdk \
secrets versions access latest \
--project cloud-devrel-kokoro-resources \
--secret ${key} > \
"${SECRET_LOCATION}/${key}"
fi
if [[ $? == 0 ]]; then
msg "Secret written to ${SECRET_LOCATION}/${key}"
else
Expand Down
9 changes: 0 additions & 9 deletions .kokoro/presubmit/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,3 @@ env_vars: {
key: "JOB_TYPE"
value: "test"
}

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 73713
keyname: "dpebot_codecov_token"
}
}
}
10 changes: 5 additions & 5 deletions .kokoro/presubmit/graalvm-native-a.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# 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_a:1.11.3"
}
build_file: "google-auth-library-java/.kokoro/build.sh"

env_vars: {
key: "JOB_TYPE"
Expand Down Expand Up @@ -47,3 +43,7 @@ env_vars: {
value: "gcloud-devel"
}

container_properties {
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.12.0"
}

10 changes: 5 additions & 5 deletions .kokoro/presubmit/graalvm-native-b.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# 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_b:1.11.3"
}
build_file: "google-auth-library-java/.kokoro/build.sh"

env_vars: {
key: "JOB_TYPE"
Expand Down Expand Up @@ -46,3 +42,7 @@ env_vars: {
key: "GOOGLE_CLOUD_QUOTA_PROJECT"
value: "gcloud-devel"
}

container_properties {
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.12.0"
}
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"fileMatch": [
"^.kokoro/presubmit/graalvm-native.*.cfg$"
],
"matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""],
"matchStrings": ["docker_image: \"us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm.*:(?<currentValue>.*?)\""],
"depNameTemplate": "com.google.cloud:google-cloud-shared-config",
"datasourceTemplate": "maven"
}
Expand Down