File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11{
22 "comment" : " Modify this file in a trivial way to cause this test suite to run." ,
3- "modification" : 2
3+ "modification" : 3
44}
Original file line number Diff line number Diff line change 11{
22 "comment" : " Modify this file in a trivial way to cause this test suite to run" ,
3- "modification" : 4
3+ "modification" : 5
44}
Original file line number Diff line number Diff line change @@ -36,8 +36,10 @@ task dataflowValidatesRunner() {
3636 dependsOn " :sdks:go:test:goBuild"
3737
3838 doLast {
39+ def pipelineOptions = [" --no_use_public_ips" ]
3940 def options = [
4041 " --runner dataflow" ,
42+ " --pipeline_opts \" ${ pipelineOptions.join(' ')} \" " ,
4143 ]
4244 exec {
4345 if (fork_java_home) {
@@ -59,6 +61,7 @@ task dataflowValidatesRunnerARM64() {
5961 doLast {
6062 def pipelineOptions = [ // Pipeline options piped directly to Go SDK flags.
6163 " --machine_type=t2a-standard-1" ,
64+ " --no_use_public_ips" ,
6265 ]
6366 def options = [
6467 " --runner dataflow" ,
Original file line number Diff line number Diff line change 4242# flag is specified, all above flag will be ignored.
4343# Please include all required pipeline options when
4444# using this flag.
45+ # additional_opts -> List of space separated pipeline options. Unlike pipeline_opts,
46+ # it appends to other flags options instead of ignoring them.
4547#
4648# Test related flags:
4749# test_opts -> List of space separated options to configure Pytest test
@@ -150,6 +152,11 @@ case $key in
150152 shift # past argument
151153 shift # past value
152154 ;;
155+ --additional_opts)
156+ ADDITIONAL_OPTS=" $2 "
157+ shift # past argument
158+ shift # past value
159+ ;;
153160 --test_opts)
154161 TEST_OPTS=" $2 "
155162 shift # past argument
@@ -257,7 +264,9 @@ if [[ -z $PIPELINE_OPTS ]]; then
257264 fi
258265
259266 PIPELINE_OPTS=$( IFS=" " ; echo " ${opts[*]} " )
260-
267+ if [[ -n $ADDITIONAL_OPTS ]]; then
268+ PIPELINE_OPTS+=" ${ADDITIONAL_OPTS} "
269+ fi
261270fi
262271
263272# Handle double quotes in PIPELINE_OPTS
Original file line number Diff line number Diff line change @@ -245,6 +245,7 @@ task validatesRunnerBatchTests {
245245 doLast {
246246 def argMap = [
247247 " test_opts" : basicPytestOpts + [" --numprocesses=8" ],
248+ " additional_opts" : [' --no_use_public_ips' ],
248249 " sdk_location" : project. ext. sdkLocation,
249250 " suite" : " validatesRunnerBatchTests-df${ pythonVersionSuffix} " ,
250251 " collect" : " it_validatesrunner and not no_sickbay_batch"
@@ -266,6 +267,7 @@ task validatesRunnerStreamingTests {
266267 doFirst {
267268 def argMap = [
268269 " test_opts" : basicPytestOpts + [" --numprocesses=8" ],
270+ " additional_opts" : [' --no_use_public_ips' ],
269271 " streaming" : " true" ,
270272 " sdk_location" : project. ext. sdkLocation,
271273 " suite" : " validatesRunnerStreamingTests-df${ pythonVersionSuffix} -xdist" ,
You can’t perform that action at this time.
0 commit comments