| commit | 77bf6c3b4963bdd111a4de2f736185e7bb245524 | [log] [tgz] |
|---|---|---|
| author | Marcin Czech <maczech@gmail.com> | Tue Jan 04 09:16:52 2022 +0100 |
| committer | Marcin Czech <maczech@gmail.com> | Tue Jan 04 09:16:52 2022 +0100 |
| tree | dbf5fd1113d97bff7bb5a45bfc029c4f9670acf7 | |
| parent | 0cb07ce5949e4a6f947f8fe6ca06612959b3b051 [diff] | |
| parent | 4d0bdf00219e394146df2ef8f777311bd6106a0d [diff] |
Merge branch 'stable-3.4' into stable-3.5 * stable-3.4: Set version to 3.4.0-rc1 Fix issue with importing PR without description Change-Id: I6b2ffb54a3381bc1e8488d185d506b8eca6505e7
This plugin allows existing GitHub repositories to be integrated as Gerrit projects.
Many people see Gerrit and GitHub as opposites: the pull-request model adopted by GitHub is often used as “easy shortcut” to the more comprehensive and structured code-review process in Gerrit.
There are many discussion threads on this:
In reality there are already OpenSource projects that have started using the two tools together:
The reason for using GitHub and Gerrit together are: a) GitHub is widely recognised and accessible by lots of world-wide sites. b) Using a public GitHub repo allows to “off-load” a lot of git pull traffic. c) Pull-request allows novice users to start getting involved. d) Gerrit code-review define the quality gates for avoiding “noise” of unstructured contributions.
When using GitHub and Gerrit together, the “master of truth” has to be Gerrit: this is because it is the place where more control in terms of security and workflow can be defined.
A Gerrit plugin can help controlling the GitHub replica and importing the pull requests as Gerrit changes.
Users can login to Gerrit using the same username and credentials in GitHub. Gerrit login points to GitHub for generating the OAuth token to be used for the code-review authenticated session.
The initial Gerrit registration page can be customised to import GitHub SSH Keys directly into Gerrit.
Existing GitHub repositories are automatically replicated to Gerrit for the purpose of performing code-review and pushing back changes once approved. Additionally to the standard Gerrit push replication, supports as well the ability to pull branches from remote GitHub repositories.
Hooks into the GitHub pull-request mechanism to automatically create a Change in Gerrit submitted for review.
GitHub plugin is designed to work with Gerrit 3.3 (currently in development). In order to build the GitHub plugin you need to have a working Gerrit 3.3 build in place.
See https://gerrit-review.googlesource.com/Documentation/dev-bazel.html for a reference on how to build Gerrit using Bazel.
Gerrit 3.3 is distributed for Java 11 only. However, the source code is compatible with Java 8 assuming you build it from the source repository by yourself.
The GitHub plugin can be built for Java 8 by using the javaVersion=1.8 Maven parameter.
Example: git clone https://gerrit.googlesource.com/plugins/github cd github mvn -DjavaVersion=1.8 install
In order to access GitHub API, we have used the lucamilanesio fork of Kohsuke API layer hosted on GitHub at https://github.com/lucamilanesio/github-api.
You need to clone and build the GitHub API as pre-requisite for building the GitHub plugin for Gerrit.
Example: git clone https://github.com/lucamilanesio/github-api.git cd github-api mvn install -DskipTests=true
You need to install the singleusergroup plugin for Gerrit (see https://gerrit-review.googlesource.com/#/admin/projects/plugins/singleusergroup).
This plugin is needed to allow Gerrit to use individual users as Groups for being used in Gerrit ACLs. As of Gerrit 3.3 singleuserplugin is a core plugin and included in Gerrit tree (if it was cloned recursively).
Example: cd gerrit bazelisk build plugins/singleusergroup cp bazel-bin/plugins/singleusergroup/singleusergroup.jar $GERRIT_SITE/plugins/.
Just clone the Git repository (see https://gerrit-review.googlesource.com/#/admin/projects/plugins/github) and do a mvn install from the root directory. This will create two JARs under github-oauth/target and github-plugin/target: the oauth is a JAR library to be copied to $GERRIT_SITE/lib whilst the plugin JAR has to be installed as usual under $GERRIT_SITE/plugins.
Example: git clone https://gerrit.googlesource.com/plugins/github cd github mvn install cp github-oauth/target/github-oauth-.jar $GERRIT_SITE/lib cp github-plugin/target/github-plugin-.jar $GERRIT_SITE/plugins
Note: Client ID & Client Secret are generated that used in the next step.
java -jar buck-out/gen/gerrit.war $gerrit_site
User Authentication
Authentication methodi []: HTTP
Ger username from custom HTTP header [Y/n]? Y
Username HTTP header []: GITHUB_USER
SSO logout URL : /oauth/reset
GitHub Integration
GitHub URL: [https://github.com]:
Use GitHub for Gerrit login? [Y/n] Y
ClientId []:
ClientSecret []:
etc/gerrit.config and etc/secure.config files in your $gerrit_site.webhookUser entry in github section of etc/gerrit.configwebhookSecret entry in github section of etc/secure.config.The GitHub plugin uses the lombok library, which provides a set of annotations to reduce the amount of boilerplate code that has to be written.
To build the plugin in Eclipse, the Lombok Eclipse integration must be installed.
Download lombok.jar from http://projectlombok.org/ and install:
java -jar lombok.jar
Follow the instructions to select your Eclipse installation if the installer cannot detect it automatically.
After the installation, Eclipse must be restarted and compilation errors should disappear.
Before importing a repository from github, this plugin checks that its git refs do not clash with Gerrit magic refs, since importing those refs would prevent users from creating change requests.
Attempting to import repositories having refs starting with refs/for/ or refs/meta will fail with an error message. For example:
Found 2 ref(s): Please remove or rename the following refs and try again: refs/for/foo, refs/meta/bar
More information on Gerrit magic refs can be found here