Skip to content
This repository was archived by the owner on Jul 10, 2024. It is now read-only.

SUBMARINE-191. Add a script to ease merge PR without access browser#4

Closed
tangzhankun wants to merge 3 commits intoapache:masterfrom
tangzhankun:add-merge-pr-script
Closed

SUBMARINE-191. Add a script to ease merge PR without access browser#4
tangzhankun wants to merge 3 commits intoapache:masterfrom
tangzhankun:add-merge-pr-script

Conversation

@tangzhankun
Copy link
Copy Markdown
Contributor

@tangzhankun tangzhankun commented Sep 20, 2019

What is this PR for?

Add a script to ease merge PR without access the browser.

What type of PR is it?

Improvement

What is the Jira issue?

https://issues.apache.org/jira/browse/SUBMARINE-191

How should this be tested?

For committer who has write access.
Usage:

git clone https://gitbox.apache.org/repos/asf/hadoop-submarine.git
cd hadoop-submarine
git remote rename origin apache
git remote add apache-github https://github.com/apache/hadoop-submarine.git
git config --local --add user.name {name}
git config --local --add user.email {username}@apache.org
echo -e "JIRA_USERNAME={jira_username}\nJIRA_PASSWORD={jira_password}" >> ~/.bashrc
source ~/.bashrc
dev-support/cicd/merge_submarine_pr.py

Questions:

  • Does the licenses files need update? No
  • Is there breaking changes for older versions? No
  • Does this needs documentation? Yes

Copy link
Copy Markdown
Member

@xunliu xunliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tangzhankun
I suggest adding a description
First create a directory dedicated to merge, Execute those commands in this directory.
Avoid confusion with your own development directory.

@xunliu
Copy link
Copy Markdown
Member

xunliu commented Sep 23, 2019

@tangzhankun , Using this script requires installing and deploying python2 natively and installing jira's python library, so I think in the future, consider providing a docker image for the committer to simplify this operation.

@tangzhankun
Copy link
Copy Markdown
Contributor Author

@liuxunorg agree. Let's provide Dockerfile to easy these tools later.

@asfgit asfgit closed this in 6c9e181 Sep 23, 2019
asfgit pushed a commit that referenced this pull request Oct 4, 2019
### What is this PR for?
Refer to the Java code specification:https://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html,

Write the resources that need to be closed in the try block instead of manually closing them in finally.

### What type of PR is it?
[ Improvement ]

### Todos
* [ ] - Task

### What is the Jira issue?
* [SUBMARINE-204](https://issues.apache.org/jira/browse/SUBMARINE-204)

### How should this be tested?
* [CI Pass](https://travis-ci.org/LinhaoZhu/hadoop-submarine/builds/592062347)

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Linhao Zhu <zhulinhao306@gmail.com>
Author: LinhaoZhu <zhulinhao306@163.com>

Closes #29 from LinhaoZhu/SUBMARINE-204 and squashes the following commits:

fe94626 [LinhaoZhu] [SUBMARINE-204] Optimize the tryResourceClose
394ead6 [LinhaoZhu] Merge branch 'master' of https://github.com/LinhaoZhu/hadoop-submarine
e960433 [Linhao Zhu] Merge pull request #4 from apache/master
8380fef [LinhaoZhu] Merge branch 'master' of https://github.com/apache/hadoop-submarine
787c1e4 [Linhao Zhu] Merge pull request #3 from apache/master
5dd7e69 [Linhao Zhu] Merge pull request #2 from apache/master
d70f4ad [Linhao Zhu] Merge pull request #1 from apache/master
asfgit pushed a commit that referenced this pull request Oct 6, 2019
### What is this PR for?
1. The ".gitignore" file contains "*.properties", The file with the ".properties" suffix cannot be uploaded, Such as log4j properties.
2. workbench-server project and hadoop-submarine/conf ,The log configuration file needs to be provided.

### What type of PR is it?
[Bug Fix ]

### Todos
* [ ] - Task

### What is the Jira issue?
* [SUBMARINE-206](https://issues.apache.org/jira/browse/SUBMARINE-206)

### How should this be tested?
* [CI Pass](https://travis-ci.org/LinhaoZhu/hadoop-submarine/builds/591377170)

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Linhao Zhu <zhulinhao306@gmail.com>
Author: LinhaoZhu <zhulinhao306@163.com>

Closes #25 from LinhaoZhu/SUBMARINE-206 and squashes the following commits:

85ecacd [LinhaoZhu] [SUBMARINE-206] Add log4j.properties
394ead6 [LinhaoZhu] Merge branch 'master' of https://github.com/LinhaoZhu/hadoop-submarine
e960433 [Linhao Zhu] Merge pull request #4 from apache/master
8380fef [LinhaoZhu] Merge branch 'master' of https://github.com/apache/hadoop-submarine
787c1e4 [Linhao Zhu] Merge pull request #3 from apache/master
5dd7e69 [Linhao Zhu] Merge pull request #2 from apache/master
d70f4ad [Linhao Zhu] Merge pull request #1 from apache/master
asfgit pushed a commit that referenced this pull request Oct 8, 2019
### What is this PR for?
In non-java files, the format of license is not in accordance with the specification and needs to be modified, including parts of xxxMapper.xml and pom.xml

### What type of PR is it?
[ Improvement ]

### Todos
* [ ] - Task

### What is the Jira issue?
* [SUBMARINE-205](https://issues.apache.org/jira/browse/SUBMARINE-205)

### How should this be tested?
* [CI Pass](https://travis-ci.org/LinhaoZhu/hadoop-submarine/builds/595014468)

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Linhao Zhu <zhulinhao306@gmail.com>
Author: LinhaoZhu <zhulinhao306@163.com>
Author: LinhaoZhu <zhulinhao306@gmail.com>
Author: qiyuezhetian <zhulinhao306@163.com>

Closes #26 from LinhaoZhu/SUBMARINE-205 and squashes the following commits:

3fe9d90 [LinhaoZhu] [SUBMARINE-205] Modify license format.
32ae4cf [qiyuezhetian] [SUBMARINE-205] Modify license format.
e39f7fa [LinhaoZhu] [SUBMARINE-205] Modify license format
394ead6 [LinhaoZhu] Merge branch 'master' of https://github.com/LinhaoZhu/hadoop-submarine
e960433 [Linhao Zhu] Merge pull request #4 from apache/master
8380fef [LinhaoZhu] Merge branch 'master' of https://github.com/apache/hadoop-submarine
787c1e4 [Linhao Zhu] Merge pull request #3 from apache/master
5dd7e69 [Linhao Zhu] Merge pull request #2 from apache/master
d70f4ad [Linhao Zhu] Merge pull request #1 from apache/master
xunliu pushed a commit to xunliu/submarine that referenced this pull request Nov 20, 2019
Update to the latest version
asfgit pushed a commit that referenced this pull request Dec 3, 2019
### What is this PR for?
1. Put in the hive SQL scripts, create a mysql user(metastore) inside mini-submarine, then create the hide-meta metadata table structure in the metastore user.
2. In submarine-site.xml, add a MYSQL configuration of metastore, Hive's jar connects mysql metadata through this configuration.

### What type of PR is it?
[ Feature ]

### Todos
* [ ] - Task

### What is the Jira issue?
*  [SUBMARINE-283](https://issues.apache.org/jira/browse/SUBMARINE-283)

### How should this be tested?
*  [Pass-CI](https://travis-ci.org/LinhaoZhu/hadoop-submarine/builds/619433250)

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: LinhaoZhu <zhulinhao306@163.com>
Author: Linhao Zhu <zhulinhao306@gmail.com>

Closes #118 from LinhaoZhu/SUBMARINE-283 and squashes the following commits:

27df4f1 [LinhaoZhu] [SUBMARINE-283]  Update docs.
38b1a48 [LinhaoZhu] [SUBMARINE-283]  Delete MetastoreRestApi.
6b31d71 [LinhaoZhu] [SUBMARINE-283]  Exclusion more.
b1b3e57 [LinhaoZhu] [SUBMARINE-283]  Exclusion jetty-server.
ea4564a [LinhaoZhu] [SUBMARINE-283]  Exclusion jetty-webapp.
44b8be6 [LinhaoZhu] [SUBMARINE-283]  Exclusion more.
15504fd [LinhaoZhu] [SUBMARINE-283]  Exclusion hadoop-auth.
12d1a99 [LinhaoZhu] [SUBMARINE-283]  Add MetastoreRestApi.
1dcd86a [LinhaoZhu] [SUBMARINE-283]  Metadata access services.
719c3c6 [Linhao Zhu] Merge pull request #7 from apache/master
bf2f678 [Linhao Zhu] Merge pull request #4 from apache/master
722bb9d [Linhao Zhu] Merge pull request #3 from apache/master
d06059a [Linhao Zhu] Merge pull request #2 from apache/master
ca7409f [Linhao Zhu] Merge pull request #1 from apache/master
kevin85421 pushed a commit to kevin85421/hadoop-submarine that referenced this pull request Dec 24, 2019
### What is this PR for?
1. Put in the hive SQL scripts, create a mysql user(metastore) inside mini-submarine, then create the hide-meta metadata table structure in the metastore user.
2. In submarine-site.xml, add a MYSQL configuration of metastore, Hive's jar connects mysql metadata through this configuration.

### What type of PR is it?
[ Feature ]

### Todos
* [ ] - Task

### What is the Jira issue?
*  [SUBMARINE-283](https://issues.apache.org/jira/browse/SUBMARINE-283)

### How should this be tested?
*  [Pass-CI](https://travis-ci.org/LinhaoZhu/hadoop-submarine/builds/619433250)

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: LinhaoZhu <zhulinhao306@163.com>
Author: Linhao Zhu <zhulinhao306@gmail.com>

Closes apache#118 from LinhaoZhu/SUBMARINE-283 and squashes the following commits:

27df4f1 [LinhaoZhu] [SUBMARINE-283]  Update docs.
38b1a48 [LinhaoZhu] [SUBMARINE-283]  Delete MetastoreRestApi.
6b31d71 [LinhaoZhu] [SUBMARINE-283]  Exclusion more.
b1b3e57 [LinhaoZhu] [SUBMARINE-283]  Exclusion jetty-server.
ea4564a [LinhaoZhu] [SUBMARINE-283]  Exclusion jetty-webapp.
44b8be6 [LinhaoZhu] [SUBMARINE-283]  Exclusion more.
15504fd [LinhaoZhu] [SUBMARINE-283]  Exclusion hadoop-auth.
12d1a99 [LinhaoZhu] [SUBMARINE-283]  Add MetastoreRestApi.
1dcd86a [LinhaoZhu] [SUBMARINE-283]  Metadata access services.
719c3c6 [Linhao Zhu] Merge pull request apache#7 from apache/master
bf2f678 [Linhao Zhu] Merge pull request apache#4 from apache/master
722bb9d [Linhao Zhu] Merge pull request apache#3 from apache/master
d06059a [Linhao Zhu] Merge pull request apache#2 from apache/master
ca7409f [Linhao Zhu] Merge pull request apache#1 from apache/master
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants