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:17:19 UTC
(beam) branch fix-postrelease-test updated (625224c2eaf -> 99ccdb70cd7)
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
discard 625224c2eaf Fix postrelease
new 99ccdb70cd7 Fix postrelease
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (625224c2eaf)
\
N -- N -- N refs/heads/fix-postrelease-test (99ccdb70cd7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
release/src/main/groovy/GoogleCloudPlatformBomArchetype.groovy | 1 +
release/src/main/groovy/QuickstartArchetype.groovy | 1 +
release/src/main/groovy/StarterArchetype.groovy | 1 +
release/src/main/groovy/TestScripts.groovy | 4 ++++
release/src/main/scripts/run_rc_validation.sh | 1 +
5 files changed, 8 insertions(+)
(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 99ccdb70cd70925905347926ee06f61823f2daa7
Author: Yi Hu <ya...@google.com>
AuthorDate: Thu Jul 17 11:51:25 2025 -0400
Fix postrelease
---
release/build.gradle.kts | 3 +-
.../groovy/GoogleCloudPlatformBomArchetype.groovy | 1 +
release/src/main/groovy/QuickstartArchetype.groovy | 1 +
release/src/main/groovy/StarterArchetype.groovy | 1 +
release/src/main/groovy/TestScripts.groovy | 47 +++++++++++++---------
release/src/main/scripts/run_rc_validation.sh | 1 +
6 files changed, 32 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/GoogleCloudPlatformBomArchetype.groovy b/release/src/main/groovy/GoogleCloudPlatformBomArchetype.groovy
index 4920d60ebc2..f26e636aa51 100644
--- a/release/src/main/groovy/GoogleCloudPlatformBomArchetype.groovy
+++ b/release/src/main/groovy/GoogleCloudPlatformBomArchetype.groovy
@@ -21,6 +21,7 @@ class GoogleCloudPlatformBomArchetype {
// Generate a maven project from the snapshot repository
String output_text = t.run """mvn archetype:generate \
--update-snapshots \
+ -Dmaven.repo.remote=${t.repoUrl()} \
-DarchetypeGroupId=org.apache.beam \
-DarchetypeArtifactId=beam-sdks-java-maven-archetypes-gcp-bom-examples \
-DarchetypeVersion=${t.ver()} \
diff --git a/release/src/main/groovy/QuickstartArchetype.groovy b/release/src/main/groovy/QuickstartArchetype.groovy
index 5c77b296a7f..f7224938846 100644
--- a/release/src/main/groovy/QuickstartArchetype.groovy
+++ b/release/src/main/groovy/QuickstartArchetype.groovy
@@ -22,6 +22,7 @@ class QuickstartArchetype {
// Generate a maven project from the snapshot repository
String output_text = t.run """mvn archetype:generate \
--update-snapshots \
+ -Dmaven.repo.remote=${t.repoUrl()} \
-DarchetypeGroupId=org.apache.beam \
-DarchetypeArtifactId=beam-sdks-java-maven-archetypes-examples \
-DarchetypeVersion=${t.ver()} \
diff --git a/release/src/main/groovy/StarterArchetype.groovy b/release/src/main/groovy/StarterArchetype.groovy
index 030e550e05f..535b80ef6c0 100644
--- a/release/src/main/groovy/StarterArchetype.groovy
+++ b/release/src/main/groovy/StarterArchetype.groovy
@@ -22,6 +22,7 @@ class StarterArchetype {
// Generate a maven project from the snapshot repository
String output_text = t.run """mvn archetype:generate \
--update-snapshots \
+ -Dmaven.repo.remote=${t.repoUrl()} \
-DarchetypeGroupId=org.apache.beam \
-DarchetypeArtifactId=beam-sdks-java-maven-archetypes-starter \
-DarchetypeVersion=${t.ver()} \
diff --git a/release/src/main/groovy/TestScripts.groovy b/release/src/main/groovy/TestScripts.groovy
index dc2438007ac..f754b3fcdf1 100644
--- a/release/src/main/groovy/TestScripts.groovy
+++ b/release/src/main/groovy/TestScripts.groovy
@@ -85,6 +85,10 @@ class TestScripts {
return var.ver
}
+ def repoUrl() {
+ return var.repoUrl
+ }
+
def gcpProject() {
return var.gcpProject
}
@@ -203,33 +207,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)
}
diff --git a/release/src/main/scripts/run_rc_validation.sh b/release/src/main/scripts/run_rc_validation.sh
index 9c93ed4ef4d..7fefd5bdf67 100755
--- a/release/src/main/scripts/run_rc_validation.sh
+++ b/release/src/main/scripts/run_rc_validation.sh
@@ -345,6 +345,7 @@ if [[ ("$python_leaderboard_direct" = true \
mvn archetype:generate \
-DarchetypeGroupId=org.apache.beam \
-DarchetypeArtifactId=beam-sdks-java-maven-archetypes-examples \
+ -Dmaven.repo.remote=${t.repoUrl} \
-DarchetypeVersion=${RELEASE_VER} \
-DgroupId=org.example \
-DartifactId=word-count-beam \