You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by yh...@apache.org on 2025/07/17 17:03:29 UTC

(beam) branch fix-postrelease-test created (now 625224c2eaf)

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

yhu pushed a change to branch fix-postrelease-test
in repository https://gitbox.apache.org/repos/asf/beam.git


      at 625224c2eaf Fix postrelease

This branch includes the following new commits:

     new 625224c2eaf Fix postrelease

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(beam) 01/01: Fix postrelease

Posted by yh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

yhu pushed a commit to branch fix-postrelease-test
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 625224c2eaff51d1ce28c26f27528fdfd261f346
Author: Yi Hu <ya...@google.com>
AuthorDate: Thu Jul 17 11:51:25 2025 -0400

    Fix postrelease
---
 release/build.gradle.kts                   |  3 +--
 release/src/main/groovy/TestScripts.groovy | 43 ++++++++++++++++--------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/release/build.gradle.kts b/release/build.gradle.kts
index 7ec49b86aac..5dd55e946cd 100644
--- a/release/build.gradle.kts
+++ b/release/build.gradle.kts
@@ -41,7 +41,6 @@ task("runJavaExamplesValidationTask") {
   dependsOn(":runners:spark:3:runQuickstartJavaSpark")
   dependsOn(":runners:flink:1.19:runQuickstartJavaFlinkLocal")
   dependsOn(":runners:direct-java:runMobileGamingJavaDirect")
-  dependsOn(":runners:google-cloud-dataflow-java:runMobileGamingJavaDataflow")
-  dependsOn(":runners:twister2:runQuickstartJavaTwister2")
+  // dependsOn(":runners:google-cloud-dataflow-java:runMobileGamingJavaDataflow")
   dependsOn(":runners:google-cloud-dataflow-java:runMobileGamingJavaDataflowBom")
 }
diff --git a/release/src/main/groovy/TestScripts.groovy b/release/src/main/groovy/TestScripts.groovy
index dc2438007ac..d63bb862d97 100644
--- a/release/src/main/groovy/TestScripts.groovy
+++ b/release/src/main/groovy/TestScripts.groovy
@@ -203,33 +203,36 @@ class TestScripts {
      }
      def m2 = new File(mvnlocalPath, ".m2/repository")
      m2.mkdirs()
-     def settings = new File(mvnlocalPath, "settings.xml")
-     if(!settings.exists()) {
-     settings.write """
-       <settings>
-         <localRepository>${m2.absolutePath}</localRepository>
-           <profiles>
-             <profile>
-               <id>testrel</id>
-                 <repositories>
-                   <repository>
-                     <id>test.release</id>
-                     <url>${var.repoUrl}</url>
-                   </repository>
-                 </repositories>
-               </profile>
-             </profiles>
-        </settings>
-         """
+     def cmd = "mvn ${args} -B"
+     if (var.repoUrl != 'https://repository.apache.org/content/repositories/snapshots') {
+       def settings = new File(mvnlocalPath, "settings.xml")
+       if(!settings.exists()) {
+         settings.write """
+<settings>
+ <localRepository>${m2.absolutePath}</localRepository>
+   <profiles>
+     <profile>
+       <id>testrel</id>
+         <repositories>
+           <repository>
+             <id>test.release</id>
+             <url>${var.repoUrl}</url>
+           </repository>
+         </repositories>
+       </profile>
+     </profiles>
+</settings>
+"""
+       }
+       cmd = "mvn ${args} -s ${settings.absolutePath} -Ptestrel -B"
      }
-     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}\" && "
+     def setPath = path.contains(mvnPath) ? "" : "export PATH=\"${mvnPath}:${path}\" && "
      return _execute(setPath + cmd)
    }