You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ib...@apache.org on 2020/04/28 14:56:04 UTC
[beam] branch master updated: [BEAM-9758] Use quotes in echo
statements to prevent * expansion.
This is an automated email from the ASF dual-hosted git repository.
ibzib 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 147c34d [BEAM-9758] Use quotes in echo statements to prevent * expansion.
new 480c733 Merge pull request #11542 from ibzib/BEAM-9758
147c34d is described below
commit 147c34d6ac4ec735c4e4b7ba668e75f626d6e1f7
Author: Kyle Weaver <kc...@google.com>
AuthorDate: Mon Apr 27 19:23:26 2020 -0400
[BEAM-9758] Use quotes in echo statements to prevent * expansion.
---
.test-infra/jenkins/LoadTestsBuilder.groovy | 2 +-
.test-infra/jenkins/NexmarkBuilder.groovy | 2 +-
.../job_PostCommit_CrossLanguageValidatesRunner_Flink.groovy | 4 ++--
.../job_PostCommit_CrossLanguageValidatesRunner_Spark.groovy | 4 ++--
.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy | 8 ++++----
.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy | 8 ++++----
.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy | 8 ++++----
.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy | 8 ++++----
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/.test-infra/jenkins/LoadTestsBuilder.groovy b/.test-infra/jenkins/LoadTestsBuilder.groovy
index 8b5e825..dcec2fa 100644
--- a/.test-infra/jenkins/LoadTestsBuilder.groovy
+++ b/.test-infra/jenkins/LoadTestsBuilder.groovy
@@ -39,7 +39,7 @@ class LoadTestsBuilder {
options.put('runner', runner.option)
context.steps {
- shell("echo *** ${title} ***")
+ shell('echo "*** ${title} ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
setGradleTask(delegate, runner, sdk, options, mainClass)
diff --git a/.test-infra/jenkins/NexmarkBuilder.groovy b/.test-infra/jenkins/NexmarkBuilder.groovy
index 942b964..fec468f 100644
--- a/.test-infra/jenkins/NexmarkBuilder.groovy
+++ b/.test-infra/jenkins/NexmarkBuilder.groovy
@@ -74,7 +74,7 @@ class NexmarkBuilder {
static void suite(context, String title, Runner runner, SDK sdk, Map<String, Object> options) {
context.steps {
- shell("echo *** RUN ${title} ***")
+ shell('echo "*** RUN ${title} ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
diff --git a/.test-infra/jenkins/job_PostCommit_CrossLanguageValidatesRunner_Flink.groovy b/.test-infra/jenkins/job_PostCommit_CrossLanguageValidatesRunner_Flink.groovy
index d49cc16..f040c10 100644
--- a/.test-infra/jenkins/job_PostCommit_CrossLanguageValidatesRunner_Flink.groovy
+++ b/.test-infra/jenkins/job_PostCommit_CrossLanguageValidatesRunner_Flink.groovy
@@ -34,14 +34,14 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_XVR_Flink',
// Gradle goals for this job.
steps {
- shell('echo *** RUN CROSS-LANGUAGE FLINK USING PYTHON 2.7 ***')
+ shell('echo "*** RUN CROSS-LANGUAGE FLINK USING PYTHON 2.7 ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':runners:flink:1.10:job-server:validatesCrossLanguageRunner')
commonJobProperties.setGradleSwitches(delegate)
switches('-PpythonVersion=2.7')
}
- shell('echo *** RUN CROSS-LANGUAGE FLINK USING PYTHON 3.5 ***')
+ shell('echo "*** RUN CROSS-LANGUAGE FLINK USING PYTHON 3.5 ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':runners:flink:1.10:job-server:validatesCrossLanguageRunner')
diff --git a/.test-infra/jenkins/job_PostCommit_CrossLanguageValidatesRunner_Spark.groovy b/.test-infra/jenkins/job_PostCommit_CrossLanguageValidatesRunner_Spark.groovy
index d725c9e..ef07cf9 100644
--- a/.test-infra/jenkins/job_PostCommit_CrossLanguageValidatesRunner_Spark.groovy
+++ b/.test-infra/jenkins/job_PostCommit_CrossLanguageValidatesRunner_Spark.groovy
@@ -34,14 +34,14 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_XVR_Spark',
// Gradle goals for this job.
steps {
- shell('echo *** RUN CROSS-LANGUAGE SPARK USING PYTHON 2.7 ***')
+ shell('echo "*** RUN CROSS-LANGUAGE SPARK USING PYTHON 2.7 ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':runners:spark:job-server:validatesCrossLanguageRunner')
commonJobProperties.setGradleSwitches(delegate)
switches('-PpythonVersion=2.7')
}
- shell('echo *** RUN CROSS-LANGUAGE SPARK USING PYTHON 3.5 ***')
+ shell('echo "*** RUN CROSS-LANGUAGE SPARK USING PYTHON 3.5 ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':runners:spark:job-server:validatesCrossLanguageRunner')
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy
index 19ca742..577b2a2 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy
@@ -35,7 +35,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
// Gradle goals for this job.
steps {
- shell('echo *** RUN NEXMARK IN BATCH MODE USING DATAFLOW RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN BATCH MODE USING DATAFLOW RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -56,7 +56,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--enforceEncodability=true',
'--enforceImmutability=true"'].join(' '))
}
- shell('echo *** RUN NEXMARK IN STREAMING MODE USING DATAFLOW RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN STREAMING MODE USING DATAFLOW RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -77,7 +77,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--enforceEncodability=true',
'--enforceImmutability=true"'].join(' '))
}
- shell('echo *** RUN NEXMARK IN SQL BATCH MODE USING DATAFLOW RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN SQL BATCH MODE USING DATAFLOW RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -99,7 +99,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--enforceEncodability=true',
'--enforceImmutability=true"'].join(' '))
}
- shell('echo *** RUN NEXMARK IN SQL STREAMING MODE USING DATAFLOW RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN SQL STREAMING MODE USING DATAFLOW RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy
index 706b536..de54327 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy
@@ -34,7 +34,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
// Gradle goals for this job.
steps {
- shell('echo *** RUN NEXMARK IN BATCH MODE USING DIRECT RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN BATCH MODE USING DIRECT RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -50,7 +50,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--enforceEncodability=true',
'--enforceImmutability=true"'].join(' '))
}
- shell('echo *** RUN NEXMARK IN STREAMING MODE USING DIRECT RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN STREAMING MODE USING DIRECT RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -66,7 +66,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--enforceEncodability=true',
'--enforceImmutability=true"'].join(' '))
}
- shell('echo *** RUN NEXMARK IN SQL BATCH MODE USING DIRECT RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN SQL BATCH MODE USING DIRECT RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -83,7 +83,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--enforceEncodability=true',
'--enforceImmutability=true"'].join(' '))
}
- shell('echo *** RUN NEXMARK IN SQL STREAMING MODE USING DIRECT RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN SQL STREAMING MODE USING DIRECT RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy
index 5aeff9d..062ffda 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy
@@ -35,7 +35,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
// Gradle goals for this job.
steps {
- shell('echo *** RUN NEXMARK IN BATCH MODE USING FLINK RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN BATCH MODE USING FLINK RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -52,7 +52,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--monitorJobs=true"'
].join(' '))
}
- shell('echo *** RUN NEXMARK IN STREAMING MODE USING FLINK RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN STREAMING MODE USING FLINK RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -69,7 +69,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--monitorJobs=true"'
].join(' '))
}
- shell('echo *** RUN NEXMARK IN SQL BATCH MODE USING FLINK RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN SQL BATCH MODE USING FLINK RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -86,7 +86,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--manageResources=false"'
].join(' '))
}
- shell('echo *** RUN NEXMARK IN SQL STREAMING MODE USING FLINK RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN SQL STREAMING MODE USING FLINK RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy
index 838fac0..bab7d75 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy
@@ -35,7 +35,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
// Gradle goals for this job.
steps {
- shell('echo *** RUN NEXMARK IN BATCH MODE USING SPARK RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN BATCH MODE USING SPARK RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -50,7 +50,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--manageResources=false',
'--monitorJobs=true'].join(' '))
}
- shell('echo *** RUN NEXMARK SQL IN BATCH MODE USING SPARK RUNNER ***')
+ shell('echo "*** RUN NEXMARK SQL IN BATCH MODE USING SPARK RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -66,7 +66,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--manageResources=false',
'--monitorJobs=true'].join(' '))
}
- shell('echo *** RUN NEXMARK IN BATCH MODE USING SPARK STRUCTURED STREAMING RUNNER ***')
+ shell('echo "*** RUN NEXMARK IN BATCH MODE USING SPARK STRUCTURED STREAMING RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
@@ -83,7 +83,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
'--manageResources=false',
'--monitorJobs=true'].join(' '))
}
- shell('echo *** RUN NEXMARK SQL IN BATCH MODE USING SPARK STRUCTURED STREAMING RUNNER ***')
+ shell('echo "*** RUN NEXMARK SQL IN BATCH MODE USING SPARK STRUCTURED STREAMING RUNNER ***"')
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')