This is an automated email from the ASF dual-hosted git repository. lgajowy pushed a commit to branch phrase-triggering-nexmark in repository https://gitbox.apache.org/repos/asf/beam.git
commit f13d3687c28bcc4c521583e22b9e2e34aa2734e2 Author: Ćukasz Gajowy <lukasz.gaj...@gmail.com> AuthorDate: Tue Nov 13 15:35:22 2018 +0100 amendments --- .test-infra/jenkins/NexmarkBuilder.groovy | 4 ++-- ...mitJobBuilder.groovy => PhraseTriggeringPostCommitBuilder.groovy} | 2 +- .test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.test-infra/jenkins/NexmarkBuilder.groovy b/.test-infra/jenkins/NexmarkBuilder.groovy index 9f2d782..93a201e 100644 --- a/.test-infra/jenkins/NexmarkBuilder.groovy +++ b/.test-infra/jenkins/NexmarkBuilder.groovy @@ -53,7 +53,7 @@ class NexmarkBuilder { SQL } - void job(def context, Runner runner, List<String> runnerSpecificOptions, TriggeringContext triggeringContext) { + static void job(context, Runner runner, List<String> runnerSpecificOptions, TriggeringContext triggeringContext) { context.steps { nexmark.suite(context, "NEXMARK IN BATCH MODE USING ${runner} RUNNER", runner, runnerSpecificOptions, Mode.BATCH, triggeringContext) nexmark.suite(context, "NEXMARK IN STREAMING MODE USING ${runner} RUNNER", runner, runnerSpecificOptions, Mode.STREAMING, triggeringContext) @@ -62,7 +62,7 @@ class NexmarkBuilder { } } - void suite(def context, + static void suite(context, String title, Runner runner, List<String> runnerSpecificOptions, diff --git a/.test-infra/jenkins/PhraseTriggeringPostcommitJobBuilder.groovy b/.test-infra/jenkins/PhraseTriggeringPostCommitBuilder.groovy similarity index 95% rename from .test-infra/jenkins/PhraseTriggeringPostcommitJobBuilder.groovy rename to .test-infra/jenkins/PhraseTriggeringPostCommitBuilder.groovy index 04c14f5..375b1b3 100644 --- a/.test-infra/jenkins/PhraseTriggeringPostcommitJobBuilder.groovy +++ b/.test-infra/jenkins/PhraseTriggeringPostCommitBuilder.groovy @@ -22,7 +22,7 @@ * Purpose of this class is to define common strategies and reporting/building paramereters * for pre- and post- commit test jobs and unify them across the project. */ -class PhraseTriggeringPostcommitJobBuilder extends PostcommitJobBuilder { +class PhraseTriggeringPostCommitBuilder extends PostcommitJobBuilder { static void postCommitJob(nameBase, triggerPhrase, githubUiHint, diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy index c2de9b7..f08280e 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy @@ -17,7 +17,7 @@ */ import CommonJobProperties as commonJobProperties -import NexmarkBuilder as nexmark +import NexmarkBuilder as Nexmark import NexmarkBigqueryProperties import NoPhraseTriggeringPostCommitBuilder import PhraseTriggeringPostCommitBuilder @@ -112,7 +112,6 @@ PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_Di '--enforceEncodability=true', '--enforceImmutability=true' ] - - nexmark.job(delegate, Runner.DIRECT, DIRECT_SPECIFIC_OPTIONS, TriggeringContext.PR) + Nexmark.job(delegate, Nexmark.Runner.DIRECT, DIRECT_SPECIFIC_OPTIONS, Nexmark.TriggeringContext.PR) } \ No newline at end of file