Jean-Michel Pouré - GOOZE wrote: > I created an account on Gerrit and looked at this URL: > https://www.opensc-project.org/codereview/#q,status:open,n,z > > Some issues are marked 18 February 2012 with "Jenkins" user. > So it seems we have GITHUB, Jenkins and Gerrit ... > > All this seems complicated.
It's not so bad. I'll try to explain! GitHub stores the project output. This is where the current repository is published for the world to use, test, and base work on. Gerrit receives input. All proposed commits arrive here. It looks like there may be two ways for commits to arrive: 1. A developer creates an account and does git push directly to Gerrit 2. A developer signals the OpenSC repository on GitHub that they want to propose some change. Maybe this is done with a GitHub pull request. Note: I am not sure about this 2. I'm guessing based on the "GitHub" owner seen for many of the proposed changes. The Owner column on https://www.opensc-project.org/codereview/#q,status:open,n,z is the name of the person who uploaded the commit into Gerrit. Whenever Gerrit receives a change, it asks Jenkins to verify that the change at least does not break the build, but Jenkins can also do some further testing, such as checking the formatting and whatever technical checks are desired for proposed changes. Only Jenkins can set the Verified flag for commits in Gerrit, and nothing can go out to GitHub from Gerrit without Jenkins approving. > Please advise: > 1) How to push a patch from GITHUB to OpenSC staging directory. > In two or three sentences. I would do: One-time setup: a. Create Gerrit account and add username and public SSH key b. git clone from github which has the patch c. cd into cloned dir d. Install commit-msg hook scp -p -P 8882 www.opensc-project.org:hooks/commit-msg .git/hooks/ e. git remote add gerrit ssh://www.opensc-project.org:8882/OpenSC.git f. git config remote.gerrit.push HEAD:refs/for/master For each patch: 1. Make the current branch equal to OpenSC GitHub + the patch (git rebase) 2. Check that the patch has a Change-Id, if not, git commit --amend -C HEAD 3. git push gerrit In case multiple commits belong together in the same logical change or that they depend on each other, then the current branch should have all these commits following the last commit of OpenSC GitHub. > 2) Explain who is responsible of reviewing and you are going to > extend the review team. Everyone is responsible for reviewing. All registered users can review all proposed changes, comment on each changed line, comment on the change as a whole, and give a score of +1, 0 or -1. Martin and Ludovic can in addition "submit" changes, ie. move them from Gerrit to the OpenSC GitHub. Obviously the job for Martin and Ludovic becomes much much easier if there are many others who have already given +1 score for a change. I am also just a user in Gerrit, like you and others, so I can't extend permissions for anyone, but I don't think doing that is very important. Focus on the code and everything else will fall into place. > > > For non-government tokens like the excellent Feitian Epass2003 > > > I would consider another approach: Updating the firmware to > > > emulate PIV so that we can put the middleware aside once and > > > for all. > > > > I agree completely that all the legacy involved in tokens and cards > > is horrendous waste of engineering resources, time and life. > > What??? Are suggesting that we should upgrade the ePass2003 firmware? > This is ridiculous. Converging on a single implementation would perhaps not be such a bad idea, but I would personally prefer something without any legacy, ie. not even CCID. > If you don't have time and resources, open the review team to the > historical OpenSC developers, like Viktor and others. The whole world can do review. The more people that help with this, the less effort it is for Martin and Ludovic. The more people who help with review, the more people will be able to join Martin and Ludovic in submitting changes from Gerrit to the OpenSC GitHub. As I already wrote, I think that everyone who could commit before Gerrit was set up just need to mention their Gerrit username to Martin in order to also be able to submit changes from Gerrit to OpenSC GitHub. //Peter
pgp6xBCPNU2ut.pgp
Description: PGP signature
_______________________________________________ opensc-devel mailing list opensc-devel@lists.opensc-project.org http://www.opensc-project.org/mailman/listinfo/opensc-devel