Fix config

GoogleCloudPlatform · Mar 30, 2020 · 02e85f8 · 02e85f8
1 parent 6a4df19
commit 02e85f8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.kokoro/.mocharc.js b/.kokoro/.mocharc.js
@@ -19,11 +19,14 @@ if (process.env.MOCHA_THROW_DEPRECATION === 'false') {
 if (process.env.MOCHA_REPORTER) {
     config.reporter = process.env.MOCHA_REPORTER;
 }
+
+const reporterOptions = [];
 if (process.env.MOCHA_REPORTER_OUTPUT) {
-    config['reporter-option'] = `output=${process.env.MOCHA_REPORTER_OUTPUT}`;
+    reporterOptions.push(`output=${process.env.MOCHA_REPORTER_OUTPUT}`);
 }
 if (process.env.MOCHA_REPORTER_SUITENAME) {
-    config['reporter-option'] = `suiteName=${process.env.MOCHA_REPORTER_SUITENAME}`;
+    reporterOptions.push(`suiteName=${process.env.MOCHA_REPORTER_SUITENAME}`);
 }
+config['reporter-option'] = reporterOptions;
 
 module.exports = config
diff --git a/.kokoro/build-with-appengine.sh b/.kokoro/build-with-appengine.sh
@@ -67,7 +67,7 @@ npm install
 
 # If tests are running against master, configure Build Cop
 # to open issues on failures:
-if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"release"* ]]; then
+if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"presubmit"* ]]; then
 	export MOCHA_REPORTER_SUITENAME=${PROJECT}
 	cleanup() {
 	chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop

diff --git a/.kokoro/build-with-run.sh b/.kokoro/build-with-run.sh
@@ -63,7 +63,7 @@ npm install
 
 # If tests are running against master, configure Build Cop
 # to open issues on failures:
-if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"release"* ]]; then
+if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"presubmit"* ]]; then
 	export MOCHA_REPORTER_SUITENAME=${PROJECT}
 	cleanup() {
 	chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -90,7 +90,7 @@ gcloud config set project $GCLOUD_PROJECT
 
 # If tests are running against master, configure Build Cop
 # to open issues on failures:
-if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"release"* ]]; then
+if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"presubmit"* ]]; then
 	export MOCHA_REPORTER_SUITENAME=${PROJECT}
 	cleanup() {
 	chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop