Merge pull request apache#32841 from apache/sharedmaven

Using single temp maven local repository for release validation tasks
twosom · Oct 18, 2024 · 3786c4a · 3786c4a
2 parents fa9eb2f + b88df7b
commit 3786c4a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 13 deletions.
diff --git a/.github/workflows/beam_PostRelease_NightlySnapshot.yml b/.github/workflows/beam_PostRelease_NightlySnapshot.yml
@@ -59,10 +59,17 @@ jobs:
         uses: ./.github/actions/setup-environment-action
         with:
           java-version: default
+      - name: Setup temp local maven
+        id: setup_local_maven
+        run: echo "NEW_TEMP_DIR=$(mktemp -d)" >> $GITHUB_OUTPUT
       - name: run PostRelease validation script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
           gradle-command: :release:runJavaExamplesValidationTask
           arguments: |
             -Pver='${{ github.event.inputs.RELEASE }}' \
             -Prepourl='${{ github.event.inputs.SNAPSHOT_URL }}' \
+            -PmavenLocalPath='${{ steps.setup_local_maven.outputs.NEW_TEMP_DIR }}'
+      - name: Clean up local maven
+        if: steps.setup_local_maven.outcome == 'success'
+        run: rm -rf '${{ steps.setup_local_maven.outputs.NEW_TEMP_DIR }}'
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -2513,6 +2513,8 @@ class BeamModulePlugin implements Plugin<Project> {
       def taskName = "run${config.type}Java${config.runner}"
       def releaseVersion = project.findProperty('ver') ?: project.version
       def releaseRepo = project.findProperty('repourl') ?: 'https://repository.apache.org/content/repositories/snapshots'
+      // shared maven local path for maven archetype projects
+      def sharedMavenLocal = project.findProperty('mavenLocalPath') ?: ''
       def argsNeeded = [
         "--ver=${releaseVersion}",
         "--repourl=${releaseRepo}"
@@ -2532,6 +2534,9 @@ class BeamModulePlugin implements Plugin<Project> {
       if (config.pubsubTopic) {
         argsNeeded.add("--pubsubTopic=${config.pubsubTopic}")
       }
+      if (sharedMavenLocal) {
+        argsNeeded.add("--mavenLocalPath=${sharedMavenLocal}")
+      }
       project.evaluationDependsOn(':release')
       project.task(taskName, dependsOn: ':release:classes', type: JavaExec) {
         group = "Verification"

diff --git a/release/src/main/groovy/TestScripts.groovy b/release/src/main/groovy/TestScripts.groovy
@@ -36,6 +36,7 @@ class TestScripts {
      static String gcsBucket
      static String bqDataset
      static String pubsubTopic
+     static String mavenLocalPath
    }
 
    def TestScripts(String[] args) {
@@ -47,6 +48,7 @@ class TestScripts {
      cli.gcsBucket(args:1, 'Google Cloud Storage Bucket')
      cli.bqDataset(args:1, "BigQuery Dataset")
      cli.pubsubTopic(args:1, "PubSub Topic")
+     cli.mavenLocalPath(args:1, "Maven local path")
 
      def options = cli.parse(args)
      var.repoUrl = options.repourl
@@ -73,6 +75,10 @@ class TestScripts {
          var.pubsubTopic = options.pubsubTopic
          println "PubSub Topic: ${var.pubsubTopic}"
      }
+     if (options.mavenLocalPath) {
+         var.mavenLocalPath = options.mavenLocalPath
+         println "Maven local path: ${var.mavenLocalPath}"
+     }
    }
 
    def ver() {
@@ -189,11 +195,16 @@ class TestScripts {
      }
    }
 
-   // Run a maven command, setting up a new local repository and a settings.xml with a custom repository
+   // Run a maven command, setting up a new local repository and a settings.xml with a custom repository if needed
    private String _mvn(String args) {
-     def m2 = new File(var.startDir, ".m2/repository")
+     String mvnlocalPath = var.mavenLocalPath
+     if (!(var.mavenLocalPath)) {
+       mvnlocalPath = var.startDir
+     }
+     def m2 = new File(mvnlocalPath, ".m2/repository")
      m2.mkdirs()
-     def settings = new File(var.startDir, "settings.xml")
+     def settings = new File(mvnlocalPath, "settings.xml")
+     if(!settings.exists()) {
      settings.write """
        <settings>
          <localRepository>${m2.absolutePath}</localRepository>
@@ -209,16 +220,17 @@ class TestScripts {
                </profile>
              </profiles>
         </settings>
-        """
-       def cmd = "mvn ${args} -s ${settings.absolutePath} -Ptestrel -B"
-       String path = System.getenv("PATH");
-       // Set the path on jenkins executors to use a recent maven
-       // MAVEN_HOME is not set on some executors, so default to 3.5.2
-       String maven_home = System.getenv("MAVEN_HOME") ?: '/home/jenkins/tools/maven/apache-maven-3.5.4'
-       println "Using maven ${maven_home}"
-       def mvnPath = "${maven_home}/bin"
-       def setPath = "export PATH=\"${mvnPath}:${path}\" && "
-       return _execute(setPath + cmd)
+         """
+     }
+     def cmd = "mvn ${args} -s ${settings.absolutePath} -Ptestrel -B"
+     String path = System.getenv("PATH");
+     // Set the path on jenkins executors to use a recent maven
+     // MAVEN_HOME is not set on some executors, so default to 3.5.2
+     String maven_home = System.getenv("MAVEN_HOME") ?: '/usr/local/maven'
+     println "Using maven ${maven_home}"
+     def mvnPath = "${maven_home}/bin"
+     def setPath = "export PATH=\"${mvnPath}:${path}\" && "
+     return _execute(setPath + cmd)
    }
 
    // Clean up and report error