From 62b0714b0dff8abf516b4d51f7833014897a759a Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Mon, 16 May 2016 16:02:33 +0200 Subject: copr: rename custom mock configs --- .../files/provision/files/mock/custom-0-i386.cfg | 24 ---------------------- .../provision/files/mock/custom-0-ppc64le.cfg | 24 ---------------------- .../files/provision/files/mock/custom-0-x86_64.cfg | 24 ---------------------- .../files/provision/files/mock/custom-1-i386.cfg | 24 ++++++++++++++++++++++ .../provision/files/mock/custom-1-ppc64le.cfg | 24 ++++++++++++++++++++++ .../files/provision/files/mock/custom-1-x86_64.cfg | 24 ++++++++++++++++++++++ .../files/provision/provision_builder_tasks.yml | 6 +++--- 7 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 roles/copr/backend/files/provision/files/mock/custom-0-i386.cfg delete mode 100644 roles/copr/backend/files/provision/files/mock/custom-0-ppc64le.cfg delete mode 100644 roles/copr/backend/files/provision/files/mock/custom-0-x86_64.cfg create mode 100644 roles/copr/backend/files/provision/files/mock/custom-1-i386.cfg create mode 100644 roles/copr/backend/files/provision/files/mock/custom-1-ppc64le.cfg create mode 100644 roles/copr/backend/files/provision/files/mock/custom-1-x86_64.cfg (limited to 'roles/copr/backend/files/provision') diff --git a/roles/copr/backend/files/provision/files/mock/custom-0-i386.cfg b/roles/copr/backend/files/provision/files/mock/custom-0-i386.cfg deleted file mode 100644 index 4d909bcca..000000000 --- a/roles/copr/backend/files/provision/files/mock/custom-0-i386.cfg +++ /dev/null @@ -1,24 +0,0 @@ -config_opts['root'] = 'custom-0-i386' -config_opts['target_arch'] = 'i686' -config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') -config_opts['chroot_setup_cmd'] = '' -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['package_manager'] = 'dnf' - -config_opts['dnf.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -reposdir=/dev/null -logfile=/var/log/dnf.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -mdpolicy=group:primary - -""" diff --git a/roles/copr/backend/files/provision/files/mock/custom-0-ppc64le.cfg b/roles/copr/backend/files/provision/files/mock/custom-0-ppc64le.cfg deleted file mode 100644 index 2327ac997..000000000 --- a/roles/copr/backend/files/provision/files/mock/custom-0-ppc64le.cfg +++ /dev/null @@ -1,24 +0,0 @@ -config_opts['root'] = 'custom-0-ppc64le' -config_opts['target_arch'] = 'ppc64le' -config_opts['legal_host_arches'] = ('ppc64le',) -config_opts['chroot_setup_cmd'] = '' -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['package_manager'] = 'dnf' - -config_opts['dnf.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -reposdir=/dev/null -logfile=/var/log/dnf.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -mdpolicy=group:primary - -""" diff --git a/roles/copr/backend/files/provision/files/mock/custom-0-x86_64.cfg b/roles/copr/backend/files/provision/files/mock/custom-0-x86_64.cfg deleted file mode 100644 index 9935d4b38..000000000 --- a/roles/copr/backend/files/provision/files/mock/custom-0-x86_64.cfg +++ /dev/null @@ -1,24 +0,0 @@ -config_opts['root'] = 'custom-0-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = '' -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['package_manager'] = 'dnf' - -config_opts['dnf.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -reposdir=/dev/null -logfile=/var/log/dnf.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -mdpolicy=group:primary - -""" diff --git a/roles/copr/backend/files/provision/files/mock/custom-1-i386.cfg b/roles/copr/backend/files/provision/files/mock/custom-1-i386.cfg new file mode 100644 index 000000000..e87c74f05 --- /dev/null +++ b/roles/copr/backend/files/provision/files/mock/custom-1-i386.cfg @@ -0,0 +1,24 @@ +config_opts['root'] = 'custom-1-i386' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') +config_opts['chroot_setup_cmd'] = '' +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['package_manager'] = 'dnf' + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/dnf.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +install_weak_deps=0 +metadata_expire=0 +mdpolicy=group:primary + +""" diff --git a/roles/copr/backend/files/provision/files/mock/custom-1-ppc64le.cfg b/roles/copr/backend/files/provision/files/mock/custom-1-ppc64le.cfg new file mode 100644 index 000000000..2ba2112d8 --- /dev/null +++ b/roles/copr/backend/files/provision/files/mock/custom-1-ppc64le.cfg @@ -0,0 +1,24 @@ +config_opts['root'] = 'custom-1-ppc64le' +config_opts['target_arch'] = 'ppc64le' +config_opts['legal_host_arches'] = ('ppc64le',) +config_opts['chroot_setup_cmd'] = '' +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['package_manager'] = 'dnf' + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/dnf.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +install_weak_deps=0 +metadata_expire=0 +mdpolicy=group:primary + +""" diff --git a/roles/copr/backend/files/provision/files/mock/custom-1-x86_64.cfg b/roles/copr/backend/files/provision/files/mock/custom-1-x86_64.cfg new file mode 100644 index 000000000..913bfde47 --- /dev/null +++ b/roles/copr/backend/files/provision/files/mock/custom-1-x86_64.cfg @@ -0,0 +1,24 @@ +config_opts['root'] = 'custom-1-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = '' +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['package_manager'] = 'dnf' + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/dnf.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +install_weak_deps=0 +metadata_expire=0 +mdpolicy=group:primary + +""" diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index bd43f7491..bb6731e16 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -50,9 +50,9 @@ template: src=files/mock/{{ item }} dest=/etc/mock with_items: - site-defaults.cfg - - custom-0-x86_64.cfg - - custom-0-i386.cfg - - custom-0-ppc64le.cfg + - custom-1-x86_64.cfg + - custom-1-i386.cfg + - custom-1-ppc64le.cfg # TODO: file globs or ansible escaping works strange, now using predefined file location #- name: "fix mock configs to use nearest mirror" -- cgit