[beam] branch master updated: Fix Jacoco not working for a few modules (#26125)

[yhu]

This is an automated email from the ASF dual-hosted git repository.

yhu 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 485822beeef Fix Jacoco not working for a few modules (#26125)
485822beeef is described below

commit 485822beeefb5294bc0a3be959bd948ee8a83e4b
Author: Yi Hu <ya...@google.com>
AuthorDate: Fri Apr 7 10:28:07 2023 -0400

    Fix Jacoco not working for a few modules (#26125)
    
    * Follow up of #25956 where some module has different package name than
      module folder name
    
    * Clean up leftover code
---
 .test-infra/jenkins/job_PreCommit_Java_IOs.groovy | 9 ++++++++-
 sdks/java/core/build.gradle                       | 9 ---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.test-infra/jenkins/job_PreCommit_Java_IOs.groovy 
b/.test-infra/jenkins/job_PreCommit_Java_IOs.groovy
index a248231102f..eec083b2f9e 100644
--- a/.test-infra/jenkins/job_PreCommit_Java_IOs.groovy
+++ b/.test-infra/jenkins/job_PreCommit_Java_IOs.groovy
@@ -199,6 +199,13 @@ def aliasMap = [
   'mongodb': 'MongoDb',
 ]
 
+// In case the package name is different from the project folder name
+def packageNameMap = [
+  'amazon-web-services': 'aws',
+  'amazon-web-services2': 'aws2',
+  'hadoop-file-system': 'hadoop',
+]
+
 ioModulesMap.forEach {cases, ioModules ->
   def hasDefaultTrigger = (cases == "true")
   ioModules.forEach {
@@ -214,7 +221,7 @@ ioModulesMap.forEach {cases, ioModules ->
     ]
     tasks.addAll(additionalTasks.get(it, []))
     def testName = aliasMap.get(it, it.capitalize())
-    String jacocoPattern = "**/org/apache/beam/sdk/io/${it}/**"
+    String jacocoPattern = 
"**/org/apache/beam/sdk/io/${packageNameMap.get(it,it)}/**"
     PrecommitJobBuilder builderSingle = new PrecommitJobBuilder(
         scope: this,
         nameBase: 'Java_' + testName + '_IO_Direct',
diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
index 60d6d539620..4e566768211 100644
--- a/sdks/java/core/build.gradle
+++ b/sdks/java/core/build.gradle
@@ -126,12 +126,3 @@ dependencies {
 project.tasks.compileTestJava {
   options.compilerArgs += ['-Xlint:-rawtypes'] // generated avro uses rawtypes 
without suppression
 }
-
-tasks.register("debugTask") {
-  gradle.taskGraph.whenReady { graph ->
-    logger.warn("$graph")
-    graph.allTasks.each {
-      logger.warn("it: ${it.project.class}, it.name: ${it.name}")
-    }
-  }
-}
\ No newline at end of file