You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2020/05/12 20:07:52 UTC

[spark] branch master updated: [SPARK-31687][INFRA] Use GitHub instead of GitBox in release script

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

dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 0feb3cb  [SPARK-31687][INFRA] Use GitHub instead of GitBox in release script
0feb3cb is described below

commit 0feb3cbe7759b7903efccba5eb35cafdc08a027e
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Tue May 12 13:07:00 2020 -0700

    [SPARK-31687][INFRA] Use GitHub instead of GitBox in release script
    
    ### What changes were proposed in this pull request?
    
    This PR aims to use GitHub urls instead of GitHub in the release scripts.
    
    ### Why are the changes needed?
    
    Currently, Spark Packaing jobs are broken due to GitBox issue.
    ```
    fatal: unable to access 'https://gitbox.apache.org/repos/asf/spark.git/': Failed to connect to gitbox.apache.org port 443: Connection timed out
    ```
    
    - https://amplab.cs.berkeley.edu/jenkins/view/Spark%20Packaging/job/spark-master-maven-snapshots/2906/console
    - https://amplab.cs.berkeley.edu/jenkins/view/Spark%20Packaging/job/spark-branch-3.0-maven-snapshots/105/console
     - https://amplab.cs.berkeley.edu/jenkins/view/Spark%20Packaging/job/spark-branch-2.4-maven-snapshots/439/console
    
    ### Does this PR introduce _any_ user-facing change?
    
    No. (This is a dev-only script.)
    
    ### How was this patch tested?
    
    Manual.
    ```
    $ cat ./test.sh
    . dev/create-release/release-util.sh
    get_release_info
    git clone "$ASF_REPO"
    
    $ sh test.sh
    Branch [branch-3.0]:
    Current branch version is 3.0.1-SNAPSHOT.
    Release [3.0.0]:
    RC # [2]:
    Full name [Dongjoon Hyun]:
    GPG key [dongjoonapache.org]:
    ================
    Release details:
    BRANCH:     branch-3.0
    VERSION:    3.0.0
    TAG:        v3.0.0-rc2
    NEXT:       3.0.1-SNAPSHOT
    
    ASF USER:   dongjoon
    GPG KEY:    dongjoonapache.org
    FULL NAME:  Dongjoon Hyun
    E-MAIL:     dongjoonapache.org
    ================
    Is this info correct [y/n]? y
    ASF password:
    GPG passphrase:
    Cloning into 'spark'...
    remote: Enumerating objects: 223, done.
    remote: Counting objects: 100% (223/223), done.
    remote: Compressing objects: 100% (117/117), done.
    remote: Total 708324 (delta 70), reused 138 (delta 32), pack-reused 708101
    Receiving objects: 100% (708324/708324), 322.08 MiB | 2.94 MiB/s, done.
    Resolving deltas: 100% (289268/289268), done.
    Updating files: 100% (16287/16287), done.
    
    $ sh test.sh
    
    ...
    ```
    
    Closes #28513 from dongjoon-hyun/SPARK-31687.
    
    Authored-by: Dongjoon Hyun <do...@apache.org>
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
 dev/create-release/release-util.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev/create-release/release-util.sh b/dev/create-release/release-util.sh
index 8ee94a6..af9ed20 100755
--- a/dev/create-release/release-util.sh
+++ b/dev/create-release/release-util.sh
@@ -19,9 +19,8 @@
 
 DRY_RUN=${DRY_RUN:-0}
 GPG="gpg --no-tty --batch"
-ASF_REPO="https://gitbox.apache.org/repos/asf/spark.git"
-ASF_REPO_WEBUI="https://gitbox.apache.org/repos/asf?p=spark.git"
-ASF_GITHUB_REPO="https://github.com/apache/spark"
+ASF_REPO="https://github.com/apache/spark"
+ASF_REPO_WEBUI="https://raw.githubusercontent.com/apache/spark"
 
 function error {
   echo "$*"
@@ -74,7 +73,7 @@ function fcreate_secure {
 }
 
 function check_for_tag {
-  curl -s --head --fail "$ASF_GITHUB_REPO/releases/tag/$1" > /dev/null
+  curl -s --head --fail "$ASF_REPO/releases/tag/$1" > /dev/null
 }
 
 function get_release_info {
@@ -91,7 +90,7 @@ function get_release_info {
   export GIT_BRANCH=$(read_config "Branch" "$GIT_BRANCH")
 
   # Find the current version for the branch.
-  local VERSION=$(curl -s "$ASF_REPO_WEBUI;a=blob_plain;f=pom.xml;hb=refs/heads/$GIT_BRANCH" |
+  local VERSION=$(curl -s "$ASF_REPO_WEBUI/$GIT_BRANCH/pom.xml" |
     parse_version)
   echo "Current branch version is $VERSION."
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org