diff options
| author | clime <clime@redhat.com> | 2016-09-19 23:10:54 +0200 |
|---|---|---|
| committer | clime <clime@redhat.com> | 2016-09-20 06:15:59 +0200 |
| commit | fd2a20972b1d52f8537f67bd7371d1dd1a269c18 (patch) | |
| tree | 62b4b56e19a8b57387342e19473b0ba546722a42 | |
| parent | 8365419d396bcc24aa6d19c0c49b7b006c6978c6 (diff) | |
| download | ansible-fd2a20972b1d52f8537f67bd7371d1dd1a269c18.tar.gz ansible-fd2a20972b1d52f8537f67bd7371d1dd1a269c18.tar.xz ansible-fd2a20972b1d52f8537f67bd7371d1dd1a269c18.zip | |
get rid of no longer needed fedpkg downgrade for copr-backend
| -rw-r--r-- | roles/copr/backend/files/provision/provision_builder_tasks.yml | 5 | ||||
| -rw-r--r-- | roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 41883a1c0..3bfceb6d1 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -33,6 +33,8 @@ # BZ 1241507 - shell: yum-deprecated install -y fedpkg-copr || yum install -y fedpkg-copr +- shell: yum-deprecated install -y fedpkg || yum install -y fedpkg + # This needs to be updated for python-fedora - shell: yum-deprecated update -y python-requests || yum install -y python-requests @@ -124,6 +126,3 @@ dest: '/etc/rpm/macros.image-language-conf' regexp: '^%_install_lang.*' state: 'absent' - -- name: we need to have older fedpkg till BZ 1315423 is resolved - shell: dnf install -y https://kojipkgs.fedoraproject.org//packages/fedpkg/1.20/2.fc23/noarch/fedpkg-1.20-2.fc23.noarch.rpm diff --git a/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml b/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml index 7f2a791ae..0530ff623 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml @@ -36,6 +36,8 @@ # BZ 1241507 - shell: yum-deprecated install -y fedpkg-copr || yum install -y fedpkg-copr +- shell: yum-deprecated install -y fedpkg || yum install -y fedpkg + # This needs to be updated for python-fedora - shell: yum-deprecated update -y python-requests || yum install -y python-requests @@ -90,7 +92,3 @@ dest: '/etc/rpm/macros.image-language-conf' regexp: '^%_install_lang.*' state: 'absent' - -- name: we need to have older fedpkg till BZ 1315423 is resolved - shell: dnf install -y https://kojipkgs.fedoraproject.org//packages/fedpkg/1.20/2.fc23/noarch/fedpkg-1.20-2.fc23.noarch.rpm - |