[incubator-celeborn] branch main updated: [CELEBORN-930][INFRA][FOLLOWUP] Fix environment variable naming

[chengpan]

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

chengpan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git


The following commit(s) were added to refs/heads/main by this push:
     new 7e373feea [CELEBORN-930][INFRA][FOLLOWUP] Fix environment variable 
naming
7e373feea is described below

commit 7e373feea789102ba37ab850a303abb3605ede2f
Author: Kent Yao <y...@apache.org>
AuthorDate: Tue Aug 29 23:33:04 2023 +0800

    [CELEBORN-930][INFRA][FOLLOWUP] Fix environment variable naming
    
    ### What changes were proposed in this pull request?
    
    Replace JIRA_USERNAME and JIRA_PASSWORD with ASF_*
    
    ### Why are the changes needed?
    
    hotfix
    
    ### Does this PR introduce _any_ user-facing change?
    
    no
    
    ### How was this patch tested?
    
    manually
    
    Closes #1861 from yaooqinn/CELEBORN-930_F.
    
    Authored-by: Kent Yao <y...@apache.org>
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 dev/merge_pr.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/merge_pr.py b/dev/merge_pr.py
index 7ecb7d969..67f410549 100755
--- a/dev/merge_pr.py
+++ b/dev/merge_pr.py
@@ -511,10 +511,10 @@ def initialize_jira():
                 fail(msg)
             else:
                 raise e
-    elif JIRA_USERNAME and JIRA_PASSWORD:
-        asf_jira = jira.client.JIRA(jira_server, basic_auth=(JIRA_USERNAME, 
JIRA_PASSWORD))
+    elif ASF_USERNAME and ASF_PASSWORD:
+        asf_jira = jira.client.JIRA(jira_server, basic_auth=(ASF_USERNAME, 
ASF_PASSWORD))
     else:
-        print("Neither JIRA_ACCESS_TOKEN nor JIRA_USERNAME/JIRA_PASSWORD are 
set.")
+        print("Neither JIRA_ACCESS_TOKEN nor ASF_USERNAME/ASF_PASSWORD are 
set.")
         continue_maybe("Continue without jira?")