This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new ce52f61 [SPARK-31691][INFRA] release-build.sh should ignore a
fallback output from `build/mvn`
ce52f61 is described below
commit ce52f61f720783e8eeb3313c763493054599091a
Author: Dongjoon Hyun <dongj...@apache.org>
AuthorDate: Tue May 12 14:24:56 2020 -0700
[SPARK-31691][INFRA] release-build.sh should ignore a fallback output from
`build/mvn`
### What changes were proposed in this pull request?
This PR adds `i` option to ignore additional `build/mvn` output which is
irrelevant to version string.
### Why are the changes needed?
SPARK-28963 added additional output message, `Falling back to
archive.apache.org to download Maven` in build/mvn. This breaks
`dev/create-release/release-build.sh` and currently Spark Packaging Jenkins job
is hitting this issue consistently and broken.
-
https://amplab.cs.berkeley.edu/jenkins/view/Spark%20Packaging/job/spark-master-maven-snapshots/2912/console
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
This happens only when the mirror fails. So, this is verified manually
hiject the script. It works like the following.
```
$ echo 'Falling back to archive.apache.org to download Maven' > out
$ build/mvn help:evaluate -Dexpression=project.version >> out
Using `mvn` from path:
/Users/dongjoon/PRS/SPARK_RELEASE_2/build/apache-maven-3.6.3/bin/mvn
$ cat out | grep -v INFO | grep -v WARNING | grep -v Download
Falling back to archive.apache.org to download Maven
3.1.0-SNAPSHOT
$ cat out | grep -v INFO | grep -v WARNING | grep -vi Download
3.1.0-SNAPSHOT
```
Closes #28514 from dongjoon-hyun/SPARK_RELEASE_2.
Authored-by: Dongjoon Hyun <dongj...@apache.org>
Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
(cherry picked from commit 3772154442e6341ea97a2f41cd672413de918e85)
Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
---
dev/create-release/release-build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/create-release/release-build.sh
b/dev/create-release/release-build.sh
index 022d3af..655b079 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -103,7 +103,7 @@ if [ -z "$SPARK_VERSION" ]; then
# Run $MVN in a separate command so that 'set -e' does the right thing.
TMP=$(mktemp)
$MVN help:evaluate -Dexpression=project.version > $TMP
- SPARK_VERSION=$(cat $TMP | grep -v INFO | grep -v WARNING | grep -v Download)
+ SPARK_VERSION=$(cat $TMP | grep -v INFO | grep -v WARNING | grep -vi
Download)
rm $TMP
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
