--HkMjoL2LAeBLhbFV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On 08/17, Nir Soffer wrote:
----- Original Message -----
> From: "Sagi Shnaidman" <sshnaidm(a)redhat.com>
> To: "Nir Soffer" <nsoffer(a)redhat.com>
> Cc: "infra" <infra(a)ovirt.org>
> Sent: Monday, August 17, 2015 6:22:52 PM
> Subject: Re: Jenkins sick?
>=20
> Hi, Nir
>=20
> There is an error:
>=20
> 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'
>=20
> You need to rebase your patch before running job:
>=20
>
https://gerrit.ovirt.org/#/c/42268/
> "Strategy Cherry Pick Cannot Merge"
=20
I don't think so.
=20
jenkins should be able to build any patch, a rebase was never required,=
=20
and should not be required.
=20
A rebase is required only when you want to merge a patch.
The patch that fails to cherry-pick is
https://gerrit.ovirt.org/#/c/34888
a quite old patch that never got merged, and well, still needs work.
=20
>=20
>=20
> On Mon, Aug 17, 2015 at 6:17 PM, Nir Soffer <nsoffer(a)redhat.com> wrote:
>=20
> > Hi guys,
> >
> > Looks like all vdsm_master_unit-tests_created jobs are failing with t=
his
> > error:
> >
> > 16:12:40 + pushd
> > /home/jenkins/workspace/vdsm_master_unit-tests_created/exported-artif=
acts
> > 16:12:40 /tmp/hudson2244843574049323608.sh: line 7: pushd:
> > /home/jenkins/workspace/vdsm_master_unit-tests_created/exported-artif=
acts:
ole
> >
> > Nir
> > _______________________________________________
> > Infra mailing list
> > Infra(a)ovirt.org
> >
http://lists.ovirt.org/mailman/listinfo/infra
> >
>=20
>=20
>=20
> --
> Best regards
> Sagi Shnaidman
>=20
_______________________________________________
Infra mailing list
Infra(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/infra
--=20
David Caro
Red Hat S.L.
Continuous Integration Engineer - EMEA ENG Virtualization R&D
Tel.: +420 532 294 605
Email: dcaro(a)redhat.com
Web:
www.redhat.com
RHT Global #: 82-62605
--HkMjoL2LAeBLhbFV
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAEBAgAGBQJV0gX8AAoJEEBxx+HSYmnDNnkH+wZeM2UJDA3MifkFYTyLwOhl
qnhnCAZiIqpYuyzEv0K1JEAYE7K+x0lI2FfavOVxzyoufy/hohY4LG47QPBOd2yT
kfJbWdmxlOdzGWg7s80HQCKUWfO1teaL+bKdTgySRaIz0IBpqyTYrw4lvxEXwdGt
e0x9AhsgP/05LYC50HGd99Bmud5QGelUMZT+thqZynlWNFSFogcdgSMU6T0ZEyM/
6tKUbdpqHrks40a52I2xuw6KVsNLg96IhUpO4IXu6OGRbGK872IXatHa0sRSQbcn
9+5lGk2g470PiLFRmzXpEM9WKbnrinyn5J2zpAwEPQQvJzabXC8L/+Q2gGP5hRY=
=5I5x
-----END PGP SIGNATURE-----
--HkMjoL2LAeBLhbFV--