Merge branch 'master' into remove-bqdt

danoscarmike · web-flow · commit d0cc4b758f40 · 2020-08-31T10:11:16.000-07:00
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -146,6 +146,7 @@ test_prog="${PROJECT_ROOT}/.kokoro/tests/run_single_test.sh"
 
 btlr_args=(
     "run"
+    "--max-cmd-duration=30m"
     "**/requirements.txt"
 )
 
diff --git a/composer/workflows/hadoop_tutorial.py b/composer/workflows/hadoop_tutorial.py
@@ -103,4 +103,4 @@
     create_dataproc_cluster >> run_dataproc_hadoop >> delete_dataproc_cluster
     # [END composer_hadoop_steps]
 
-# [END composer_hadoop]
+# [END composer_hadoop_tutorial]
diff --git a/testing/btlr b/testing/btlr

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ test_prog="${PROJECT_ROOT}/.kokoro/tests/run_single_test.sh"`
`146`	`146`
`147`	`147`	`btlr_args=(`
`148`	`148`	`"run"`
	`149`	`+ "--max-cmd-duration=30m"`
`149`	`150`	`"**/requirements.txt"`
`150`	`151`	`)`
`151`	`152`