To be more exact: Merge to the base branch the PR was created against. Could be master, could be 4.7 and such. The code snipped I linked to also does that.
Sent from my iPhone > On 28 Mar 2016, at 09:13, Remi Bergsma <rberg...@schubergphilis.com> wrote: > > Hi Sanjeev, > > I’d propose taking the latest master, ensure it is up2date, make a temp > branch then merge the PR to be tested on that. This ensures you test the > result of the merge, like it will happen om master. > > For the merging, use the same script we use when we merge for real: > https://github.com/apache/cloudstack/blob/master/tools/git/git-pr > > When I tested loads of PRs I used a similar approach. You can probably > copy/paste these lines: > https://github.com/MissionCriticalCloud/bubble-toolkit/blob/master/helper_scripts/cloudstack/check-pr.sh#L80#L96<https://github.com/MissionCriticalCloud/bubble-toolkit/blob/master/helper_scripts/cloudstack/check-pr.sh#L80%23L96> > > Regards, > Remi > > > From: Sanjeev Neelarapu > <sanjeev.neelar...@accelerite.com<mailto:sanjeev.neelar...@accelerite.com>> > Reply-To: "dev@cloudstack.apache.org<mailto:dev@cloudstack.apache.org>" > <dev@cloudstack.apache.org<mailto:dev@cloudstack.apache.org>> > Date: Monday 28 March 2016 at 09:05 > To: "dev@cloudstack.apache.org<mailto:dev@cloudstack.apache.org>" > <dev@cloudstack.apache.org<mailto:dev@cloudstack.apache.org>> > Subject: [DISCUSS] PR testing process > > Hi, > > Currently CI is picking the code from the PR branch, which may or may not be > rebased with latest master. This is causing test failures even though they > were fixed in latest master. > e.g.: test_vpc_site2site_vpn. > Error Message > local variable 'vm1' referenced before assignment. > > There were few issues with this test suite which were fixed in master. > However, we don’t see these changes in some of the PR branches. > > Any thoughts on how to overcome this? > > > Best Regards, > Sanjeev N > Chief Product Engineer, Accelerite > Off: +91 40 6722 9368 | EMail: > sanjeev.neelar...@accelerite.com<mailto:sanjeev.neelar...@accelerite.com> > [cid:image001.png@01D18361.DE542D60] > > > DISCLAIMER ========== This e-mail may contain privileged and confidential > information which is the property of Accelerite, a Persistent Systems > business. It is intended only for the use of the individual or entity to > which it is addressed. If you are not the intended recipient, you are not > authorized to read, retain, copy, print, distribute or use this message. If > you have received this communication in error, please notify the sender and > delete all copies of this message. Accelerite, a Persistent Systems business > does not accept any liability for virus infected mails.
