This is an automated email from the ASF dual-hosted git repository. damondouglas pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push: new 4a3b6c55fd8 Use unique GCS object path (#30690) 4a3b6c55fd8 is described below commit 4a3b6c55fd8a02911b99d7ef8b5fa6f006c23fb2 Author: Damon <damondoug...@users.noreply.github.com> AuthorDate: Wed Mar 20 16:35:59 2024 -0700 Use unique GCS object path (#30690) --- release/src/main/groovy/MobileGamingCommands.groovy | 5 +++-- release/src/main/groovy/mobilegaming-java-dataflow.groovy | 5 ++++- release/src/main/groovy/mobilegaming-java-direct.groovy | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/release/src/main/groovy/MobileGamingCommands.groovy b/release/src/main/groovy/MobileGamingCommands.groovy index 2b38943067a..39f526d7da8 100644 --- a/release/src/main/groovy/MobileGamingCommands.groovy +++ b/release/src/main/groovy/MobileGamingCommands.groovy @@ -21,6 +21,7 @@ class MobileGamingCommands { private TestScripts testScripts + private String testRunId private static final INPUT_GAMING_DATA = "gs://dataflow-samples/game/5000_gaming_data.csv" @@ -58,11 +59,11 @@ class MobileGamingCommands { "BattleshipGrey")) public String getUserScoreOutputName(String runner){ - return "java-userscore-result-${RUNNERS[runner]}.txt" + return "java-userscore-result-${RUNNERS[runner]}/${testRunId}/output" } public String getHourlyTeamScoreOutputName(String runner){ - return "java-hourlyteamscore-result-${RUNNERS[runner]}.txt" + return "java-hourlyteamscore-result-${RUNNERS[runner]}/${testRunId}/output" } public String createPipelineCommand(String exampleName, String runner, String jobName='', String className=null){ diff --git a/release/src/main/groovy/mobilegaming-java-dataflow.groovy b/release/src/main/groovy/mobilegaming-java-dataflow.groovy index 462b3d2cea0..bb0b76bd675 100644 --- a/release/src/main/groovy/mobilegaming-java-dataflow.groovy +++ b/release/src/main/groovy/mobilegaming-java-dataflow.groovy @@ -18,7 +18,6 @@ */ t = new TestScripts(args) -mobileGamingCommands = new MobileGamingCommands(testScripts: t) /* * Run the mobile game examples on Dataflow. @@ -36,6 +35,8 @@ String command_output_text * Run the UserScore example on DataflowRunner * */ +mobileGamingCommands = new MobileGamingCommands(testScripts: t, testRunId: UUID.randomUUID().toString()) + t.intent("Running: UserScore example on DataflowRunner") t.run(mobileGamingCommands.createPipelineCommand("UserScore", runner)) command_output_text = t.run "gsutil cat gs://${t.gcsBucket()}/${mobileGamingCommands.getUserScoreOutputName(runner)}* | grep user19_BananaWallaby" @@ -48,6 +49,8 @@ t.run "gsutil rm gs://${t.gcsBucket()}/${mobileGamingCommands.getUserScoreOutput * Run the HourlyTeamScore example on DataflowRunner * */ +mobileGamingCommands = new MobileGamingCommands(testScripts: t, testRunId: UUID.randomUUID().toString()) + t.intent("Running: HourlyTeamScore example on DataflowRunner") t.run(mobileGamingCommands.createPipelineCommand("HourlyTeamScore", runner)) command_output_text = t.run "gsutil cat gs://${t.gcsBucket()}/${mobileGamingCommands.getHourlyTeamScoreOutputName(runner)}* | grep AzureBilby " diff --git a/release/src/main/groovy/mobilegaming-java-direct.groovy b/release/src/main/groovy/mobilegaming-java-direct.groovy index 9ff24cefaf9..3c6f4ca01a6 100644 --- a/release/src/main/groovy/mobilegaming-java-direct.groovy +++ b/release/src/main/groovy/mobilegaming-java-direct.groovy @@ -18,7 +18,6 @@ */ t = new TestScripts(args) -mobileGamingCommands = new MobileGamingCommands(testScripts: t) /* * Run the mobile game examples on DirectRunner. @@ -36,6 +35,8 @@ String command_output_text * Run the UserScore example with DirectRunner * */ +mobileGamingCommands = new MobileGamingCommands(testScripts: t, testRunId: UUID.randomUUID().toString()) + t.intent("Running: UserScore example on DirectRunner") t.run(mobileGamingCommands.createPipelineCommand("UserScore", runner)) command_output_text = t.run "grep user19_BananaWallaby ${mobileGamingCommands.getUserScoreOutputName(runner)}* " @@ -47,6 +48,8 @@ t.success("UserScore successfully run on DirectRunners.") * Run the HourlyTeamScore example with DirectRunner * */ +mobileGamingCommands = new MobileGamingCommands(testScripts: t, testRunId: UUID.randomUUID().toString()) + t.intent("Running: HourlyTeamScore example on DirectRunner") t.run(mobileGamingCommands.createPipelineCommand("HourlyTeamScore", runner)) command_output_text = t.run "grep AzureBilby ${mobileGamingCommands.getHourlyTeamScoreOutputName(runner)}* "