From c4dd45c2ff6f57ff6c17a7ec0122f8ec8c108e86 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Thu, 20 Jul 2017 09:11:00 -0600 Subject: [PATCH] Revert "ansible: update examples with patched python-jenkins" This reverts commit 38036523b73513790dcc17d71e9260f0dca9bf1e (minus the whitespace fixes). Our patch is now merged upstream in python-jenkins 0.4.15, so we can stop using our custom ceph fork. --- ansible/examples/slave.yml | 6 ++---- ansible/examples/slave_libvirt.yml | 6 ++---- ansible/examples/slave_static.yml | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ansible/examples/slave.yml b/ansible/examples/slave.yml index 31cdf9ae..62c331a1 100644 --- a/ansible/examples/slave.yml +++ b/ansible/examples/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/examples/slave_libvirt.yml b/ansible/examples/slave_libvirt.yml index 479d7f4a..0bd627d2 100644 --- a/ansible/examples/slave_libvirt.yml +++ b/ansible/examples/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 diff --git a/ansible/examples/slave_static.yml b/ansible/examples/slave_static.yml index 2ee8a34b..d1866b8d 100644 --- a/ansible/examples/slave_static.yml +++ b/ansible/examples/slave_static.yml @@ -243,10 +243,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 -- 2.39.5