Ideal would be to create a *new throw-away branch* that is forked from current master and just changes the itBranch in the Jenkinsfile to the integration test branch you want to merge.
If those integration tests do not pass on master then that is a different story. On 19 January 2017 at 12:01, Christian Schulte <[email protected]> wrote: > Am 19.01.2017 um 12:37 schrieb Stephen Connolly: > > If you need to run against a different IT branch, then change > > https://github.com/apache/maven/blob/master/Jenkinsfile#L22 to point to > the > > branch on integration tests here are the options: > > > > 1. (Ideal option) Create a *throwaway* branch on maven.git specifically > for > > the integration test run where you change > > https://github.com/apache/maven/blob/master/Jenkinsfile#L22 to point to > > your maven-integration-testing.git branch name. Get a clean run on that > > *throwaway* branch and then merge the integration tests and throw-away > the > > throw-away branch. > > To confirm: I should update the Jenkinsfile on the MNG-5958 branch to > run the ITs of that said branch? When merging to master, I will revert > the changes to the Jenkinsfile first on the branch (using git revert) > and will squash all of this before the merge so that there is only one > single commit going to the master branch? > > The failing IT just shows that there are changes in core making an > existing IT fail. This is documented in the initial review request > thread on this mailing list. > > Could you also verify the ranges used in the updated tests, please? > > Regards, > -- > Christian > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > >
