Skip to content

Commit d4ec6f4

Browse files
committed
chore: Restore test
1 parent f71f95c commit d4ec6f4

1 file changed

Lines changed: 39 additions & 42 deletions

File tree

.kokoro/build.sh

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -86,22 +86,25 @@ case ${JOB_TYPE} in
8686
fi
8787
;;
8888
integration)
89-
echo "FORCED: Running only ITComputeGoldenSignals"
90-
setup_cloud "java-compute"
91-
install_modules "java-compute"
92-
93-
mvn verify -Penable-integration-tests -Pquick-build --projects "java-compute/google-cloud-compute" \
94-
${INTEGRATION_TEST_ARGS} \
95-
-B -ntp -fae \
96-
--also-make \
97-
-Dtest=*ITComputeGoldenSignals \
98-
-Dsurefire.failIfNoSpecifiedTests=false \
99-
-DskipUnitTests=true \
100-
-Dorg.slf4j.simpleLogger.showDateTime=true \
101-
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
102-
-Dmaven.wagon.http.retryHandler.count=5 \
103-
-T 1C
104-
RETURN_CODE=$?
89+
generate_modified_modules_list
90+
if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then
91+
echo "Skipping integration tests as this is Release Please SNAPSHOT pull request."
92+
elif [[ ${#modified_module_list[@]} -gt 0 ]]; then
93+
filter_modules_with_integration_tests
94+
if [[ ${#filtered_it_module_list[@]} -eq 0 ]]; then
95+
echo "No modified modules contain integration tests. Skipping."
96+
else
97+
module_list=$(
98+
IFS=,
99+
echo "${filtered_it_module_list[*]}"
100+
)
101+
setup_cloud "$module_list"
102+
install_modules "$module_list"
103+
run_integration_tests "$module_list"
104+
fi
105+
else
106+
echo "No Integration Tests to run"
107+
fi
105108
;;
106109
integration-single)
107110
generate_modified_modules_list false
@@ -149,34 +152,28 @@ case ${JOB_TYPE} in
149152
fi
150153
;;
151154
graalvm-presubmit)
152-
echo "FORCED: Running only ITComputeGoldenSignals for GraalVM"
153-
setup_cloud "java-compute"
154-
install_modules "java-compute"
155-
156-
mvn test -Pnative -Pquick-build --projects "java-compute/google-cloud-compute" \
157-
${INTEGRATION_TEST_ARGS} \
158-
-B -ntp -fae \
159-
-Dtest=*ITComputeGoldenSignals \
160-
-Dsurefire.failIfNoSpecifiedTests=false \
161-
-DtrimStackTrace=false \
162-
-Dorg.slf4j.simpleLogger.showDateTime=true \
163-
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS
164-
RETURN_CODE=$?
155+
generate_graalvm_presubmit_modules_list
156+
if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then
157+
echo "Not running GraalVM checks -- this is Release Please SNAPSHOT pull request."
158+
else
159+
printf "Running GraalVM presubmit checks for:\n%s\n" "${module_list}"
160+
setup_cloud "$module_list"
161+
install_modules "$module_list"
162+
run_graalvm_tests "$module_list"
163+
fi
165164
;;
166165
graalvm)
167-
echo "FORCED: Running only ITComputeGoldenSignals for GraalVM"
168-
setup_cloud "java-compute"
169-
install_modules "java-compute"
170-
171-
mvn test -Pnative -Pquick-build --projects "java-compute/google-cloud-compute" \
172-
${INTEGRATION_TEST_ARGS} \
173-
-B -ntp -fae \
174-
-Dtest=*ITComputeGoldenSignals \
175-
-Dsurefire.failIfNoSpecifiedTests=false \
176-
-DtrimStackTrace=false \
177-
-Dorg.slf4j.simpleLogger.showDateTime=true \
178-
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS
179-
RETURN_CODE=$?
166+
generate_graalvm_modules_list
167+
if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then
168+
echo "Not running GraalVM checks -- this is Release Please SNAPSHOT pull request."
169+
elif [ ! -z "${module_list}" ]; then
170+
printf "Running GraalVM checks for:\n%s\n" "${module_list}"
171+
setup_cloud "$module_list"
172+
install_modules "$module_list"
173+
run_graalvm_tests "$module_list"
174+
else
175+
echo "Not running GraalVM checks -- No changes in relevant modules"
176+
fi
180177
;;
181178
graalvm-single)
182179
generate_modified_modules_list false

0 commit comments

Comments
 (0)