Re: How to clone/commit/push (for 'buildbot' repo) ?
On Fri, Jun 10, 2022 at 11:59 AM Christian Lohmaier wrote: > On Thu, Jun 9, 2022 at 5:48 PM Maarten Hoes wrote: > > On Thu, Jun 9, 2022 at 4:20 PM Maarten Hoes wrote: > > > > [current gerrit sshd doesn't support sftp, only scp protocol, -O switch can > > be forced to use it] > > > > […] > > But perhaps someone should look at this for a more structural solution ? > > Gerrit will be updated this weekend, and part of that is also an > updated version of apache mina-sshd, that should also fix the sftp > issue. https://status.documentfoundation.org/#scheduled-21 Or maybe not, maybe that's not enabled in gerrit - gerrit upstream added a note re use of -O switch to the message instead: https://gerrit-review.googlesource.com/c/gerrit/+/338074 Thanks for Guilhem for pointing that out on IRC And there's always the option to download it via anon-access using e.g. curl or wget from https://gerrit.libreoffice.org/tools/hooks/commit-msg and chmod +x the file. ciao Christian
Re: How to clone/commit/push (for 'buildbot' repo) ?
Hi Maarten, *, On Thu, Jun 9, 2022 at 5:48 PM Maarten Hoes wrote: > On Thu, Jun 9, 2022 at 4:20 PM Maarten Hoes wrote: >> >> What I think I see happening is that the client is trying to force 'sftp' >> when the scp command is used, and the server is not having it ? Or perhaps I >> am simply using the wrong command to clone the repo and set it up for >> commiting / putting things up for review ? > > [current gerrit sshd doesn't support sftp, only scp protocol, -O switch can > be forced to use it] > > And if I add that to the scp commandline, it all works as expected, and I was > able to put my changes up for review in gerrit, doing the following, as I > mentioned in my earlier email : > […] > But perhaps someone should look at this for a more structural solution ? Gerrit will be updated this weekend, and part of that is also an updated version of apache mina-sshd, that should also fix the sftp issue. https://status.documentfoundation.org/#scheduled-21 ciao Christian
Re: How to clone/commit/push (for 'buildbot' repo) ?
On Thu, Jun 9, 2022 at 4:20 PM Maarten Hoes wrote: > > What I think I see happening is that the client is trying to force 'sftp' > when the scp command is used, and the server is not having it ? Or perhaps > I am simply using the wrong command to clone the repo and set it up for > commiting / putting things up for review ? > > Hrm. I did some more googling, and came across scp's '-O' switch, which as described in the man page : " -O Use the original SCP protocol for file transfers instead of the SFTP protocol. Forcing the use of the SCP protocol may be necessary for servers that do not implement SFTP, for backwards-compatibility for particular filename wildcard patterns and for expanding paths with a ‘~’ prefix for older SFTP servers. " And if I add that to the scp commandline, it all works as expected, and I was able to put my changes up for review in gerrit, doing the following, as I mentioned in my earlier email : > cd buildbot/lcov-report/ > git checkout -b lcov-report > cp ~/bin/libreoffice/README ~/bin/libreoffice/lcov-report.sh . > git add README lcov-report.sh > git commit > git push origin lcov-report:refs/for/master > But perhaps someone should look at this for a more structural solution ? - Maarten
How to clone/commit/push (for 'buildbot' repo) ?
Hi, I made some modifications to the lcov report script (and the accompanying README) in the buildbot repo, but I am having problems with putting the modified version up for review. I am probably doing things the wrong way, so perhaps it's best if I just show what I am doing here. I saw a few different ways on the libreoffice website to clone the buildbot repo, but the one I am (currently) trying because I think it's the correct one, I got from : 'https://gerrit.libreoffice.org/admin/repos/buildbot,general'. I just added a few '-vvv' to the scp command for debugging). $ git clone "ssh://mh...@gerrit.libreoffice.org:29418/buildbot" && scp -vvv -p -P 29418 mh...@gerrit.libreoffice.org:hooks/commit-msg "buildbot/.git/hooks/" < --- snip --- > debug3: Ignored env BASH_FUNC_which%% debug3: Ignored env OLDPWD debug3: Ignored env _ debug1: Sending subsystem: sftp debug2: channel 0: request subsystem confirm 1 debug3: send packet: type 98 debug2: channel_input_open_confirmation: channel 0: callback done debug2: channel 0: open confirm rwindow 2097152 rmax 32768 debug3: receive packet: type 100 debug2: channel_input_status_confirm: type 100 id 0 subsystem request failed on channel 0 scp: Connection closed I checked my pub key, and it matches what's shown at : ' https://gerrit.libreoffice.org/settings/' for my profile. What I think I see happening is that the client is trying to force 'sftp' when the scp command is used, and the server is not having it ? Or perhaps I am simply using the wrong command to clone the repo and set it up for commiting / putting things up for review ? For what it's worth: when I go to my cloned 'core' repo, and run './logerrit test', I get the message 'Your gerrit setup was successful!'. In case it matters, I am running Fedora 36 and openssh-8.8p1. Any and all help is appreciated, - Maarten PS: What I think I need to do after a successful clone of the buildbot repo, would be something along the lines of this : ? cd buildbot/lcov-report/ git checkout -b lcov-report cp ~/bin/libreoffice/README ~/bin/libreoffice/lcov-report.sh . git add README lcov-report.sh git commit git push origin lcov-report:refs/for/master
