From ad4b47536f885947ac3ebde59ed34a63ed34c250 Mon Sep 17 00:00:00 2001 From: Charles Engelke Date: Thu, 11 Oct 2018 09:56:30 -0700 Subject: [PATCH 1/3] Updated trampoline script to match latest version that cleans up files --- .kokoro/trampoline.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 6e293e638bb..12e9ea1c450 100755 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -1,5 +1,4 @@ #!/bin/bash - # Copyright 2017 Google Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,4 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" +set -eo pipefail + +# Always run the cleanup script, regardless of the success of bouncing into +# the container. + +function cleanup() { + chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh + ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh + echo "cleanup"; +} +trap cleanup EXIT + +python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" \ No newline at end of file From 7f2b255588f8bf821491bfd23a4eb5d377ce673f Mon Sep 17 00:00:00 2001 From: Charles Engelke Date: Thu, 11 Oct 2018 09:57:45 -0700 Subject: [PATCH 2/3] Added newline to end of trampoline script --- .kokoro/trampoline.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 12e9ea1c450..fef7c24de02 100755 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -25,4 +25,4 @@ function cleanup() { } trap cleanup EXIT -python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" \ No newline at end of file +python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" From 5c582de0f27ff3bd9eed7ea214385c2f5510bf40 Mon Sep 17 00:00:00 2001 From: Charles Engelke Date: Thu, 11 Oct 2018 11:26:33 -0700 Subject: [PATCH 3/3] A quickstart test was missing requirements.txt --- .../endpoints-frameworks-v2/quickstart/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 appengine/standard/endpoints-frameworks-v2/quickstart/requirements.txt diff --git a/appengine/standard/endpoints-frameworks-v2/quickstart/requirements.txt b/appengine/standard/endpoints-frameworks-v2/quickstart/requirements.txt new file mode 100644 index 00000000000..5e81977c7ab --- /dev/null +++ b/appengine/standard/endpoints-frameworks-v2/quickstart/requirements.txt @@ -0,0 +1,2 @@ +google-endpoints==4.5.0 +google-endpoints-api-management==1.9.1