From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 20 Jul 2017 15:10:40 +0000 (-0600)
Subject: Revert "ansible: using forked version of python-jenkins until we can fix upstream"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=352ea86489e81ca60617eb7ecb1e558302c6b545;p=ceph-build.git

Revert "ansible: using forked version of python-jenkins until we can fix upstream"

This reverts commit 8f5da3ae532e7fa7976404e2bb5885bdcd95f6d5.

Our patch is now merged upstream in python-jenkins 0.4.15, so we can
stop using our custom ceph fork.
---

diff --git a/ansible/slave.yml b/ansible/slave.yml
index 9ff55155..852ddba6 100644
--- a/ansible/slave.yml
+++ b/ansible/slave.yml
@@ -218,10 +218,8 @@
 
     - name: install python-jenkins
       sudo: true
-      # HORRIBLY BROKEN. This is temporary until this lands upstream:
-      # https://github.com/ceph/python-jenkins/commit/8e018bf7d88dfc308833d195a6ebd29231a8969d
-      # https://review.openstack.org/460363
-      pip: name=git+https://github.com/ceph/python-jenkins@patched#egg=python-jenkins
+      # https://bugs.launchpad.net/python-jenkins/+bug/1500898
+      pip: name=python-jenkins version=0.4.7
 
     - name: add github.com host key
       sudo: true
diff --git a/ansible/slave_libvirt.yml b/ansible/slave_libvirt.yml
index 479d7f4a..0bd627d2 100644
--- a/ansible/slave_libvirt.yml
+++ b/ansible/slave_libvirt.yml
@@ -188,10 +188,8 @@
 
     - name: install python-jenkins
       sudo: true
-      # HORRIBLY BROKEN. This is temporary until this lands upstream:
-      # https://github.com/ceph/python-jenkins/commit/8e018bf7d88dfc308833d195a6ebd29231a8969d
-      # https://review.openstack.org/460363
-      pip: name=git+https://github.com/ceph/python-jenkins@patched#egg=python-jenkins
+      # https://bugs.launchpad.net/python-jenkins/+bug/1500898
+      pip: name=python-jenkins version=0.4.7
 
     - name: add github.com host key
       sudo: true