[QA] Jenkins Job Builder has been upgraded

[Željko Filipin]

If you are having trouble with `git pull` on
integration/jenkins-job-builder (like I did), `git reset --hard
origin/master` should fix the problem.

$ git pull
...
Automatic merge failed; fix conflicts and then commit the result.

$ git reset --hard origin/master
HEAD is now at edebce7f Complete support of Yaml Axis Plugin

For more information:

https://phabricator.wikimedia.org/P5250

Thanks to Paladox and Antoine for helping me in #wikimedia-releng.

Željko

On Tue, Apr 11, 2017 at 5:45 PM, Antoine Musso <hashar+wmf at free.fr> wrote:

>
> Hello,
>
> I have updated our Jenkins Job Builder fork in
> integration/jenkins-job-builder.git to catch up with latest upstream
> changes.
>
> The update is force updated with master pointing to:
> edebce7f98a8e041537b9f0569a99ca9050a6066
>
>
> I have updated all the jobs and the log is kept in T162674
> https://phabricator.wikimedia.org/T162674
>
>
> The list of requirements has been bumped, notably:
>
>  steevedore
>  python-jenkins now requires 0.4.14 (was 0.4.18)
>
> We recommend to use tox to run our JJB fork, thus one would want to
> delete the virtual environments: rm -fR .tox
>
> The next run of 'tox -e venv -- jenkins-jobs' will reinstall the
> dependencies.
>
> Thanks!
>
> --
> Antoine "hashar" Musso
>
>
> _______________________________________________
> QA mailing list
> QA at lists.wikimedia.org
> https://lists.wikimedia.org/mailman/listinfo/qa
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.wikimedia.org/pipermail/qa/attachments/20170412/e95a959e/attachment.html>