diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2015-11-07 02:34:35 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2015-11-07 02:34:35 +0000 |
| commit | c2472b5a47131761b31125bdf37f036f0e1203dc (patch) | |
| tree | 50dd078b081b23c9fb2f7fcf5d521291b5c85248 /roles/copr | |
| parent | 102ef4668c6d97272e710492b88084ab0723c98d (diff) | |
| download | ansible-c2472b5a47131761b31125bdf37f036f0e1203dc.tar.gz ansible-c2472b5a47131761b31125bdf37f036f0e1203dc.tar.xz ansible-c2472b5a47131761b31125bdf37f036f0e1203dc.zip | |
Revert "use F23 image for copr builders"
This reverts commit 357cf847dd8daddc8534f2a037d15978e276b6b1.
Diffstat (limited to 'roles/copr')
| -rw-r--r-- | roles/copr/backend/files/provision/builderpb_nova.yml | 10 | ||||
| -rw-r--r-- | roles/copr/backend/files/provision/provision_builder_tasks.yml | 16 |
2 files changed, 9 insertions, 17 deletions
diff --git a/roles/copr/backend/files/provision/builderpb_nova.yml b/roles/copr/backend/files/provision/builderpb_nova.yml index f1b6199cd..1109be0e7 100644 --- a/roles/copr/backend/files/provision/builderpb_nova.yml +++ b/roles/copr/backend/files/provision/builderpb_nova.yml @@ -30,16 +30,6 @@ poll: 2 -# only enable when creating base image -#- name: provision builder -# hosts: builder_temp_group -# gather_facts: False -# sudo: True -# user: fedora -# -# tasks: -# - raw: dnf install -y python2 python-dnf libselinux-python libsemanage-python python-firewall - - name: provision builder hosts: builder_temp_group gather_facts: True diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 27ae3b8d4..2e73fbbc8 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -2,7 +2,7 @@ copy: src="copr.repo" dest="/etc/yum.repos.d/copr.repo" - name: install pkgs - dnf: state=present pkg={{ item }} + yum: state=present pkg={{ item }} with_items: - dnf - dnf-plugins-core @@ -21,19 +21,21 @@ - ethtool # - fedpkg-copr # BZ 1241507 -- shell: yum-deprecated install -y fedpkg-copr +- shell: yum-deprecated install -y fedpkg-copr || yum install -y fedpkg-copr -#- get_url: url=https://kojipkgs.fedoraproject.org//packages/mock/1.2.12/1.fc21/noarch/mock-1.2.12-1.fc21.noarch.rpm dest=/tmp/ -#- yum: state=present name=/tmp/mock-1.2.12-1.fc21.noarch.rpm +# This needs to be updated for python-fedora +- shell: yum-deprecated update -y python-requests || yum install -y python-requests + +- get_url: url=https://kojipkgs.fedoraproject.org//packages/mock/1.2.12/1.fc21/noarch/mock-1.2.12-1.fc21.noarch.rpm dest=/tmp/ +- yum: state=present name=/tmp/mock-1.2.12-1.fc21.noarch.rpm - name: make sure newest rpm # todo: replace with dnf after ansible 1.9 is available - dnf: name={{ item }} state=latest + yum: name={{ item }} state=latest with_items: - rpm - glib2 - ca-certificates - - python-requests - copy: src=files/fedpkg-copr.conf dest=/etc/rpkg/fedpkg-copr.conf @@ -67,7 +69,7 @@ - name: prepare cache when: prepare_base_image is defined async: 14400 - shell: "for i in epel-5-i386 epel-5-x86_64 epel-6-i386 epel-6-x86_64 epel-7-x86_64 fedora-21-i386 fedora-21-x86_64 fedora-22-i386 fedora-22-x86_64 fedora-23-i386 fedora-23-x86_64 fedora-rawhide-i386 fedora-rawhide-x86_64; do mock --init -r $i; done" + shell: "for i in epel-5-i386 epel-5-x86_64 epel-6-i386 epel-6-x86_64 epel-7-x86_64 fedora-20-i386 fedora-20-x86_64 fedora-21-i386 fedora-21-x86_64 fedora-22-i386 fedora-22-x86_64 fedora-23-i386 fedora-23-x86_64 fedora-rawhide-i386 fedora-rawhide-x86_64; do mock --init -r $i; done" - name: mockbuilder user user: name=mockbuilder groups=mock |