Skip to content

Commit 19837d8

Browse files
committed
runs all tests in separate projects
1 parent ca8abb1 commit 19837d8

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

.kokoro/system_tests.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ cd github/php-docs-samples
2222
export GOOGLE_APPLICATION_CREDENTIALS=$KOKORO_GFILE_DIR/service-account.json
2323
export PATH="$PATH:/opt/composer/vendor/bin:/root/google-cloud-sdk/bin"
2424

25+
# Temporary hack to see if this works
26+
export GOOGLE_PROJECT_ID=$GOOGLE_ALT_PROJECT_ID GOOGLE_STORAGE_BUCKET=$GOOGLE_ALT_STORAGE_BUCKET
27+
2528
# export the secrets
2629
if [ -f ${GOOGLE_APPLICATION_CREDENTIALS} ]; then
2730
gcloud auth activate-service-account \

testing/run_test_suite.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ REST_TESTS=(
3737
)
3838

3939
# These tests run in a different project, determined by GOOGLE_ALT_PROJECT_ID
40-
ALT_PROJECT_TESTS=(
41-
datastore/api
42-
dialogflow
43-
dlp
44-
kms
45-
monitoring
46-
pubsub/api
47-
storage
48-
video
49-
)
40+
# ALT_PROJECT_TESTS=(
41+
# datastore/api
42+
# dialogflow
43+
# dlp
44+
# kms
45+
# monitoring
46+
# pubsub/api
47+
# storage
48+
# video
49+
# )
5050

5151
GRPC_INI=$(php -i | grep grpc.ini | sed 's/,*$//g')
5252

@@ -82,12 +82,12 @@ run_tests()
8282
else
8383
CMD="phpunit -v"
8484
fi
85-
if [[ "${ALT_PROJECT_TESTS[@]}" =~ "${DIR}" ]] && [ ! -z "$GOOGLE_ALT_PROJECT_ID" ]; then
86-
echo "Using alternate project $GOOGLE_ALT_PROJECT_ID"
87-
GOOGLE_PROJECT_ID=$GOOGLE_ALT_PROJECT_ID GOOGLE_STORAGE_BUCKET=$GOOGLE_ALT_STORAGE_BUCKET $CMD
88-
else
85+
# if [[ "${ALT_PROJECT_TESTS[@]}" =~ "${DIR}" ]] && [ ! -z "$GOOGLE_ALT_PROJECT_ID" ]; then
86+
# echo "Using alternate project $GOOGLE_ALT_PROJECT_ID"
87+
# GOOGLE_PROJECT_ID=$GOOGLE_ALT_PROJECT_ID GOOGLE_STORAGE_BUCKET=$GOOGLE_ALT_STORAGE_BUCKET $CMD
88+
# else
8989
$CMD
90-
fi
90+
# fi
9191
if [ $? == 0 ]; then
9292
echo "$1: ok" >> "${SUCCEEDED_FILE}"
9393
else

0 commit comments

Comments
 (0)