From 7eb2446fa77e63e9c05d21599452ff7d4ff68105 Mon Sep 17 00:00:00 2001
From: Kenneth Knowles <kenn@apache.org>
Date: Thu, 26 Oct 2017 13:57:53 -0700
Subject: [PATCH] Remove coveralls invocations from all jobs

---
 .../jenkins/job_beam_Java_UnitTest.groovy     |  1 -
 ...b_beam_PostCommit_Java_MavenInstall.groovy | 29 ++++++++++---------
 ...ostCommit_Java_MavenInstall_Windows.groovy |  2 +-
 ...ob_beam_PreCommit_Java_MavenInstall.groovy | 26 ++++++++---------
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/.test-infra/jenkins/job_beam_Java_UnitTest.groovy b/.test-infra/jenkins/job_beam_Java_UnitTest.groovy
index 8f03900a40ad..d3c8ed782f27 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',
diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_MavenInstall.groovy
index 92913b688cca..5d67e6dcc342 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(' '))
 }
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 6ef272cfbe8d..f1ba7043ce48 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')
 }
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
index d2d248521791..52423e01a0e8 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(' '))
 }