From 5dc0dc3f9cb3f80e8e09aafff2a6c9fe6f56d711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 16 Feb 2015 11:41:51 +0000 Subject: [PATCH] no need to use separate config for EPEL7 they are already in mock --- .../provision/files/mock/epel-7-x86_64.cfg | 60 ------------------- .../backend/templates/provision/builderpb.yml | 1 - 2 files changed, 61 deletions(-) delete mode 100644 roles/copr/backend/files/provision/files/mock/epel-7-x86_64.cfg diff --git a/roles/copr/backend/files/provision/files/mock/epel-7-x86_64.cfg b/roles/copr/backend/files/provision/files/mock/epel-7-x86_64.cfg deleted file mode 100644 index 0e04cb34ea..0000000000 --- a/roles/copr/backend/files/provision/files/mock/epel-7-x86_64.cfg +++ /dev/null @@ -1,60 +0,0 @@ -config_opts['root'] = 'epel-7-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['dist'] = 'el7' # only useful for --resultdir variable subst -config_opts['releasever'] = '7' - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= - -# repos -[base] -name=BaseOS -mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os -failovermethod=priority - -[updates] -name=updates -enabled=1 -mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates -failovermethod=priority - -[epel] -name=epel -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 -failovermethod=priority - -[extras] -name=extras -mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=extras -failovermethod=priority - -[testing] -name=epel-testing -enabled=0 -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel7&arch=x86_64 -failovermethod=priority - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/epel7-build/latest/x86_64/ -cost=2000 -enabled=0 - -[epel-debug] -name=epel-debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-7&arch=x86_64 -failovermethod=priority -enabled=0 -""" diff --git a/roles/copr/backend/templates/provision/builderpb.yml b/roles/copr/backend/templates/provision/builderpb.yml index 52441d20c0..8c95a912b3 100644 --- a/roles/copr/backend/templates/provision/builderpb.yml +++ b/roles/copr/backend/templates/provision/builderpb.yml @@ -88,7 +88,6 @@ action: copy src={{ files }}/mock/{{ item }} dest=/etc/mock with_items: - site-defaults.cfg - - epel-7-x86_64.cfg - lineinfile: dest=/root/.bashrc line="ulimit -n 10240" insertafter=EOF {% endraw %}