Repository: beam Updated Branches: refs/heads/master 2b8cd3f20 -> a6f69bd12
Remove coveralls invocations from all jobs Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/7eb2446f Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/7eb2446f Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/7eb2446f Branch: refs/heads/master Commit: 7eb2446fa77e63e9c05d21599452ff7d4ff68105 Parents: e01c78d Author: Kenneth Knowles <[email protected]> Authored: Thu Oct 26 13:57:53 2017 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Thu Oct 26 13:57:53 2017 -0700 ---------------------------------------------------------------------- .../jenkins/job_beam_Java_UnitTest.groovy | 1 - ...job_beam_PostCommit_Java_MavenInstall.groovy | 29 ++++++++++---------- ..._PostCommit_Java_MavenInstall_Windows.groovy | 2 +- .../job_beam_PreCommit_Java_MavenInstall.groovy | 26 ++++++++---------- 4 files changed, 28 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/7eb2446f/.test-infra/jenkins/job_beam_Java_UnitTest.groovy ---------------------------------------------------------------------- diff --git a/.test-infra/jenkins/job_beam_Java_UnitTest.groovy b/.test-infra/jenkins/job_beam_Java_UnitTest.groovy index 8f03900..d3c8ed7 100644 --- a/.test-infra/jenkins/job_beam_Java_UnitTest.groovy +++ b/.test-infra/jenkins/job_beam_Java_UnitTest.groovy @@ -40,7 +40,6 @@ mavenJob('beam_Java_UnitTest') { '-e', "-P${profiles.join(',')}", 'surefire:test@default-test', - 'coveralls:report', // TODO: Will this work? Can't verify on my own Jenkins due to no coveralls. "-pl '!sdks/python'", '-DrepoToken=$COVERALLS_REPO_TOKEN', '-DpullRequest=$ghprbPullId', http://git-wip-us.apache.org/repos/asf/beam/blob/7eb2446f/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy ---------------------------------------------------------------------- diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy index 92913b6..5d67e6d 100644 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy +++ b/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy @@ -44,21 +44,22 @@ mavenJob('beam_PostCommit_Java_MavenInstall') { 'Run Java PostCommit') // Maven goals for this job. - goals('''\ - clean install coveralls:report \ - --projects sdks/java/core \ - --also-make \ - --also-make-dependents \ - --batch-mode \ - --errors \ - --fail-at-end \ - -P release,dataflow-runner \ - -DrepoToken=$COVERALLS_REPO_TOKEN \ - -DskipITs=false \ - -DintegrationTestPipelineOptions=\'[ \ + goals([ + 'clean', + 'install', + '--projects sdks/java/core,runners/direct-java', + ' --also-make', + '--also-make-dependents', + '--batch-mode', + '--errors', + '--fail-at-end', + '-P release,dataflow-runner', + '-DrepoToken=$COVERALLS_REPO_TOKEN', + '-D skipITs=false', + '''-D integrationTestPipelineOptions=\'[ \ "--project=apache-beam-testing", \ "--tempRoot=gs://temp-storage-for-end-to-end-tests", \ "--runner=TestDataflowRunner" \ - ]\' \ - ''') + ]\' ''' + ].join(' ')) } http://git-wip-us.apache.org/repos/asf/beam/blob/7eb2446f/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall_Windows.groovy ---------------------------------------------------------------------- diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall_Windows.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall_Windows.groovy index 6ef272c..f1ba704 100644 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall_Windows.groovy +++ b/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall_Windows.groovy @@ -42,5 +42,5 @@ mavenJob('beam_PostCommit_Java_MavenInstall_Windows') { 'Run Java Windows PostCommit') // Maven goals for this job. - goals('-B -e -Prelease,direct-runner -DrepoToken=$COVERALLS_REPO_TOKEN -DpullRequest=$ghprbPullId help:effective-settings clean install coveralls:report') + goals('-B -e -Prelease,direct-runner -DrepoToken=$COVERALLS_REPO_TOKEN -DpullRequest=$ghprbPullId help:effective-settings clean install') } http://git-wip-us.apache.org/repos/asf/beam/blob/7eb2446f/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy ---------------------------------------------------------------------- diff --git a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy index d2d2485..52423e0 100644 --- a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy +++ b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy @@ -41,18 +41,16 @@ mavenJob('beam_PreCommit_Java_MavenInstall') { common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/java/core,runners/direct-java -am -amd', 'Run Java PreCommit') // Maven goals for this job: The Java SDK, its dependencies, and things that depend on it. - goals('''\ - --batch-mode \ - --errors \ - --activate-profiles release,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner \ - --projects sdks/java/core,runners/direct-java \ - --also-make \ - --also-make-dependents \ - -D repoToken=$COVERALLS_REPO_TOKEN \ - -D pullRequest=$ghprbPullId \ - help:effective-settings \ - clean \ - install \ - coveralls:report \ - ''') + goals([ + '--batch-mode', + '--errors', + '--activate-profiles release,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner', + '--projects sdks/java/core,runners/direct-java', + '--also-make', + '--also-make-dependents', + '-D pullRequest=$ghprbPullId', + 'help:effective-settings', + 'clean', + 'install' + ].join(' ')) }
