buildbot failure in on jmeter-nightly

2019-06-16 Thread buildbot
The Buildbot has detected a new failure on builder jmeter-nightly while building . Full details are available at: https://ci.apache.org/builders/jmeter-nightly/builds/1375 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_slave7_ubuntu Build Reason: The Nightly scheduler na

Buildbot and Git

2019-06-16 Thread Felix Schumacher
Hi all, I tried to adapt the buildbot config for JMeter to reflect the git migration. The init-svnVersion step has been removed and most of the "got_revision" properties are replaced by the buildnumber to keep a linear numbering for the nightlies. The only place were I kept the got_revision prope

Re: Migrate SVN -> Git

2019-06-16 Thread Felix Schumacher
Am 16.06.19 um 20:27 schrieb Vladimir Sitnikov: > Felix>As it is only a few people that can do a merge, I would try to first > > What I mean is GitHub's merge button. Yes, I thought so. If there is a way to pre-select "Rebase and merge", than do so :) > > Felix>Thanks for your work on this whol

Re: Migrate SVN -> Git

2019-06-16 Thread Vladimir Sitnikov
Hm, it looks like the set of files is smaller: 1.5M At this point I'm +0 re removal of rhino jars as 1.5M could probably be just ignored. On the other hand, file removal can be implemented on top of previous cleanup, so there's no need to re-clone, and so on. Any thoughts? 43080ba9bab1 3832 lib/j

Re: Migrate SVN -> Git

2019-06-16 Thread Vladimir Sitnikov
Felix>As it is only a few people that can do a merge, I would try to first What I mean is GitHub's merge button. Felix>Thanks for your work on this whole migration. Thanks. However, I see there 9MiB of jars left in the repo: b10a48fa41c3 14549 lib/jodd-log-3.6.4.jar 780b574cb24f 24538 lib/xpp3_m

Re: Migrate SVN -> Git

2019-06-16 Thread Felix Schumacher
Thanks for your work on this whole migration. Pushing through gitbox worked like a charme. Felix Am 13.06.19 um 05:40 schrieb Vladimir Sitnikov: > The repository is configured (mail notifications should go to commits@j.a.o), > and we can continue with JMeter development. > > The URLs are: https:

Re: Migrate SVN -> Git

2019-06-16 Thread Felix Schumacher
Am 16.06.19 um 20:10 schrieb Vladimir Sitnikov: > Philippe>Fixed and tested first PR merging > > Ok. Great. > > Should we use "squash and merge" / "rebase and merge" for PRs by default? > > You just created a merge commit "Merge pull request #468 from > ubikloadpack/master", and merge commits mig

Re: Migrate SVN -> Git

2019-06-16 Thread Vladimir Sitnikov
Philippe>Fixed and tested first PR merging Ok. Great. Should we use "squash and merge" / "rebase and merge" for PRs by default? You just created a merge commit "Merge pull request #468 from ubikloadpack/master", and merge commits might become complicated, especially when you merge commits that w

Re: Migrate SVN -> Git

2019-06-16 Thread Philippe Mouawad
Thanks Vladimir. Fixed and tested first PR merging. That's nice ! On Sun, Jun 16, 2019 at 7:11 PM Vladimir Sitnikov < sitnikov.vladi...@gmail.com> wrote: > Philippe>Our build is marked as failed on github due to a commit on > failing PR. > > I guess the reason is README.md explicitly refers bran

Re: Migrate SVN -> Git

2019-06-16 Thread Vladimir Sitnikov
Philippe>Our build is marked as failed on github due to a commit on failing PR. I guess the reason is README.md explicitly refers branch=trunk, so we need to update README.md to point to "master" branch as well. As you can see, "master" build is ok: https://travis-ci.org/apache/jmeter/branches V

Re: Migrate SVN -> Git

2019-06-16 Thread Philippe Mouawad
One thing I noticed since migration. Our build is marked as failed on github due to a commit on failing PR. i don’t think it was the case before. Regards On Thursday, June 13, 2019, Vladimir Sitnikov wrote: > Vladimir> https://github.com/apache/jmeter > Philippe>Isn't it > > Just in case: https: