Revert "copr builders: on F22 tell mock to use yum-deprecated"
yum isn't in the mock chroots and is breaking all builds for f22+
This reverts commit 2b1af001a4
.
This commit is contained in:
parent
51ecfa56e4
commit
22b9f49506
4 changed files with 4 additions and 8 deletions
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
- hosts: builder_temp_group
|
- hosts: builder_temp_group
|
||||||
user: root
|
user: root
|
||||||
gather_facts: True
|
gather_facts: False
|
||||||
vars:
|
vars:
|
||||||
- files: files/
|
- files: files/
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@
|
||||||
action: authorized_key user=mockbuilder key='{{ lookup('file', '/home/copr/provision/files/buildsys.pub') }}'
|
action: authorized_key user=mockbuilder key='{{ lookup('file', '/home/copr/provision/files/buildsys.pub') }}'
|
||||||
|
|
||||||
- name: put updated mock configs into /etc/mock
|
- name: put updated mock configs into /etc/mock
|
||||||
action: template src={{ files }}/mock/{{ item }} dest=/etc/mock
|
action: copy src={{ files }}/mock/{{ item }} dest=/etc/mock
|
||||||
with_items:
|
with_items:
|
||||||
- site-defaults.cfg
|
- site-defaults.cfg
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
- name: provision builder
|
- name: provision builder
|
||||||
hosts: builder_temp_group
|
hosts: builder_temp_group
|
||||||
gather_facts: True
|
gather_facts: False
|
||||||
sudo: True
|
sudo: True
|
||||||
user: fedora
|
user: fedora
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,3 @@ config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024
|
||||||
config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '50g'
|
config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '50g'
|
||||||
config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
|
config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
|
||||||
config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
|
config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
|
||||||
|
|
||||||
{% if ansible_distribution == 'Fedora' and ansible_distribution_major_version > 21 %}
|
|
||||||
config_opts['yum_command'] = '/usr/bin/yum-deprecated'
|
|
||||||
{% endif %}
|
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
- ca-certificates
|
- ca-certificates
|
||||||
|
|
||||||
- name: put updated mock configs into /etc/mock
|
- name: put updated mock configs into /etc/mock
|
||||||
template: src=files/mock/{{ item }} dest=/etc/mock
|
copy: src=files/mock/{{ item }} dest=/etc/mock
|
||||||
with_items:
|
with_items:
|
||||||
- site-defaults.cfg
|
- site-defaults.cfg
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue