----- Original Message ----- > From: "Sagi Shnaidman" <[email protected]> > To: "Nir Soffer" <[email protected]> > Cc: "infra" <[email protected]> > Sent: Monday, August 17, 2015 6:22:52 PM > Subject: Re: Jenkins sick? > > Hi, Nir > > There is an error: > > 16:12:39 error: could not apply 7b15e79... Adding vdsm unit test job > 16:12:39 hint: after resolving the conflicts, mark the corrected paths > 16:12:39 hint: with 'git add <paths>' or 'git rm <paths>' > 16:12:39 hint: and commit the result with 'git commit' > > You need to rebase your patch before running job: > > https://gerrit.ovirt.org/#/c/42268/ > "Strategy Cherry Pick Cannot Merge"
I don't think so. jenkins should be able to build any patch, a rebase was never required, and should not be required. A rebase is required only when you want to merge a patch. > > > On Mon, Aug 17, 2015 at 6:17 PM, Nir Soffer <[email protected]> wrote: > > > Hi guys, > > > > Looks like all vdsm_master_unit-tests_created jobs are failing with this > > error: > > > > 16:12:40 + pushd > > /home/jenkins/workspace/vdsm_master_unit-tests_created/exported-artifacts > > 16:12:40 /tmp/hudson2244843574049323608.sh: line 7: pushd: > > /home/jenkins/workspace/vdsm_master_unit-tests_created/exported-artifacts: > > No such file or directory > > > > See > > http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/6337/console > > > > Nir > > _______________________________________________ > > Infra mailing list > > [email protected] > > http://lists.ovirt.org/mailman/listinfo/infra > > > > > > -- > Best regards > Sagi Shnaidman > _______________________________________________ Infra mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/infra
