Skip to content

Commit 44c41cb

Browse files
morambrocopybara-github
authored andcommitted
Use Bazel remote caching for tink-java-awskms Kokoro builds
PiperOrigin-RevId: 643989485 Change-Id: I7fb9040af8e3fc31a6780197f346145c9f2116fb
1 parent 42b028e commit 44c41cb

3 files changed

Lines changed: 51 additions & 7 deletions

File tree

kokoro/gcp_ubuntu/bazel/run_tests.sh

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ readonly CONTAINER_IMAGE
4646
if [[ -n "${CONTAINER_IMAGE:-}" ]]; then
4747
RUN_COMMAND_ARGS+=( -c "${CONTAINER_IMAGE}" )
4848
fi
49+
50+
if [[ -n "${TINK_REMOTE_BAZEL_CACHE_GCS_BUCKET:-}" ]]; then
51+
cp "${TINK_REMOTE_BAZEL_CACHE_SERVICE_KEY}" ./cache_key
52+
cat <<EOF > /tmp/env_variables.txt
53+
BAZEL_REMOTE_CACHE_NAME=${TINK_REMOTE_BAZEL_CACHE_GCS_BUCKET}/bazel/${TINK_JAVA_BASE_IMAGE_HASH}
54+
EOF
55+
RUN_COMMAND_ARGS+=( -e /tmp/env_variables.txt )
56+
fi
57+
4958
readonly RUN_COMMAND_ARGS
5059

5160
cat <<'EOF' > _do_run_test.sh
@@ -57,7 +66,14 @@ if ! cmp -s BUILD.bazel BUILD.bazel.temp; then
5766
diff -u BUILD.bazel BUILD.bazel.temp
5867
exit 1
5968
fi
60-
./kokoro/testutils/run_bazel_tests.sh .
69+
70+
CACHE_FLAGS=()
71+
if [[ -n "${BAZEL_REMOTE_CACHE_NAME:-}" ]]; then
72+
CACHE_FLAGS+=( -c "${BAZEL_REMOTE_CACHE_NAME}" )
73+
fi
74+
readonly CACHE_FLAGS
75+
76+
./kokoro/testutils/run_bazel_tests.sh "${CACHE_FLAGS[@]}" .
6177
EOF
6278
chmod +x _do_run_test.sh
6379

kokoro/gcp_ubuntu/maven/run_tests.sh

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@ if [[ -n "${CONTAINER_IMAGE:-}" ]]; then
4747
RUN_COMMAND_ARGS+=( -c "${CONTAINER_IMAGE}" )
4848
fi
4949

50+
# File that stores environment variables to pass to the container.
51+
readonly ENV_VARIABLES_FILE="/tmp/env_variables.txt"
52+
53+
if [[ -n "${TINK_REMOTE_BAZEL_CACHE_GCS_BUCKET:-}" ]]; then
54+
cp "${TINK_REMOTE_BAZEL_CACHE_SERVICE_KEY}" ./cache_key
55+
cat <<EOF > "${ENV_VARIABLES_FILE}"
56+
BAZEL_REMOTE_CACHE_NAME=${TINK_REMOTE_BAZEL_CACHE_GCS_BUCKET}/bazel/${TINK_JAVA_BASE_IMAGE_HASH}
57+
EOF
58+
RUN_COMMAND_ARGS+=( -e "${ENV_VARIABLES_FILE}" )
59+
fi
60+
5061
cat <<'EOF' > _do_run_test.sh
5162
set -euo pipefail
5263
@@ -55,8 +66,14 @@ set -euo pipefail
5566
-e "com.google.crypto.tink:tink" "//:tink-awskms" \
5667
"maven/tink-java-awskms.pom.xml"
5768
58-
./maven/maven_deploy_library.sh install tink-awskms \
59-
maven/tink-java-awskms.pom.xml HEAD
69+
MAVEN_DEPLOY_LIBRARY_OPTS=()
70+
if [[ -n "${BAZEL_REMOTE_CACHE_NAME:-}" ]]; then
71+
MAVEN_DEPLOY_LIBRARY_OPTS+=( -c "${BAZEL_REMOTE_CACHE_NAME}" )
72+
fi
73+
readonly MAVEN_DEPLOY_LIBRARY_OPTS
74+
75+
./maven/maven_deploy_library.sh "${MAVEN_DEPLOY_LIBRARY_OPTS[@]}" install \
76+
tink-awskms maven/tink-java-awskms.pom.xml HEAD
6077
6178
readonly AWS_CREDENTIALS="testdata/aws/credentials.cred"
6279
readonly AWS_TEST_KEY_URI="aws-kms://arn:aws:kms:us-east-2:235739564943:key/3ee50705-5a82-4f5b-9753-05c4f473922f"
@@ -75,7 +92,7 @@ chmod +x _do_run_test.sh
7592
trap cleanup EXIT
7693

7794
cleanup() {
78-
rm -rf _do_run_test.sh
95+
rm -rf _do_run_test.sh "${ENV_VARIABLES_FILE}"
7996
}
8097

8198
./kokoro/testutils/run_command.sh "${RUN_COMMAND_ARGS[@]}" ./_do_run_test.sh
@@ -90,11 +107,10 @@ if [[ "${IS_KOKORO}" == "true" \
90107

91108
# Share the required env variables with the container to allow publishing the
92109
# snapshot on Sonatype.
93-
cat <<EOF > env_variables.txt
110+
cat <<EOF >> "${ENV_VARIABLES_FILE}"
94111
SONATYPE_USERNAME
95112
SONATYPE_PASSWORD
96113
EOF
97-
RUN_COMMAND_ARGS+=( -e env_variables.txt )
98114

99115
./kokoro/testutils/run_command.sh "${RUN_COMMAND_ARGS[@]}" \
100116
./maven/maven_deploy_library.sh -u "${GITHUB_URL}" snapshot tink-awskms \

kokoro/macos_external/bazel/run_tests.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,17 @@ if [[ -n "${KOKORO_ROOT:-}" ]] ; then
2727
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-8-latest/Contents/Home
2828
fi
2929

30+
BAZEL_TEST_ARGS=()
31+
if [[ -n "${TINK_REMOTE_BAZEL_CACHE_GCS_BUCKET:-}" ]]; then
32+
cp "${TINK_REMOTE_BAZEL_CACHE_SERVICE_KEY}" ./cache_key
33+
BAZEL_TEST_ARGS+=(
34+
-c "${TINK_REMOTE_BAZEL_CACHE_GCS_BUCKET}/bazel/macos_tink_java_awskms"
35+
)
36+
fi
37+
38+
BAZEL_TEST_ARGS+=( . )
39+
40+
readonly BAZEL_TEST_ARGS
41+
3042
./kokoro/testutils/update_android_sdk.sh
31-
./kokoro/testutils/run_bazel_tests.sh .
43+
./kokoro/testutils/run_bazel_tests.sh "${BAZEL_TEST_ARGS[@]}"

0 commit comments

Comments
 (0)