Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Revert "use F23 image for copr builders"

Browse source 
This reverts commit 357cf847dd.
This commit is contained in:
Kevin Fenzi 2015-11-07 02:34:35 +00:00
parent 102ef4668c
commit c2472b5a47
4 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/copr-back
View file

@ -6,7 +6,8 @@ copr_nova_tenant_id: "5d99f099b7fe4b0387f0352f6301ba6a"
copr_nova_tenant_name: "copr" copr_nova_tenant_name: "copr"
copr_nova_username: "copr" copr_nova_username: "copr"
copr_builder_image_name: "builder-2015-10-06" # copr_builder_image_name: "Fedora-Cloud-Base-20141203-21"
copr_builder_image_name: "builder-2015-05-27"
copr_builder_flavor_name: "ms2.builder" copr_builder_flavor_name: "ms2.builder"
copr_builder_network_name: "copr-net" copr_builder_network_name: "copr-net"
copr_builder_key_name: "buildsys" copr_builder_key_name: "buildsys"

2
inventory/group_vars/copr-back-stg
View file

@ -6,7 +6,7 @@ copr_nova_tenant_id: "a6ff2158641c439a8426d7facab45437"
copr_nova_tenant_name: "coprdev" copr_nova_tenant_name: "coprdev"
copr_nova_username: "copr" copr_nova_username: "copr"
copr_builder_image_name: "builder-2015-10-06" copr_builder_image_name: "builder-2015-05-27"
copr_builder_flavor_name: "ms2.builder" copr_builder_flavor_name: "ms2.builder"
copr_builder_network_name: "coprdev-net" copr_builder_network_name: "coprdev-net"
copr_builder_key_name: "buildsys" copr_builder_key_name: "buildsys"

10
roles/copr/backend/files/provision/builderpb_nova.yml
View file

@ -30,16 +30,6 @@
poll: 2 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 - name: provision builder
hosts: builder_temp_group hosts: builder_temp_group
gather_facts: True gather_facts: True

16
roles/copr/backend/files/provision/provision_builder_tasks.yml
View file

@ -2,7 +2,7 @@
copy: src="copr.repo" dest="/etc/yum.repos.d/copr.repo" copy: src="copr.repo" dest="/etc/yum.repos.d/copr.repo"
- name: install pkgs - name: install pkgs
dnf: state=present pkg={{ item }} yum: state=present pkg={{ item }}
with_items: with_items:
- dnf - dnf
- dnf-plugins-core - dnf-plugins-core
@ -21,19 +21,21 @@
- ethtool - ethtool
# - fedpkg-copr # - fedpkg-copr
# BZ 1241507 # 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/ # This needs to be updated for python-fedora
#- yum: state=present name=/tmp/mock-1.2.12-1.fc21.noarch.rpm - 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 - name: make sure newest rpm
# todo: replace with dnf after ansible 1.9 is available # todo: replace with dnf after ansible 1.9 is available
dnf: name={{ item }} state=latest yum: name={{ item }} state=latest
with_items: with_items:
- rpm - rpm
- glib2 - glib2
- ca-certificates - ca-certificates
- python-requests
- copy: src=files/fedpkg-copr.conf dest=/etc/rpkg/fedpkg-copr.conf - copy: src=files/fedpkg-copr.conf dest=/etc/rpkg/fedpkg-copr.conf
@ -67,7 +69,7 @@
- name: prepare cache - name: prepare cache
when: prepare_base_image is defined when: prepare_base_image is defined
async: 14400 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 - name: mockbuilder user
user: name=mockbuilder groups=mock user: name=mockbuilder groups=mock