remove the no longer needed compose mock configs

We no longer use the old compose mock configs as part of our processes. nuke
them all from being installed

Signed-off-by: Dennis Gilmore <ausil@fedoraproject.org>

44 files changed, 0 insertions, 1529 deletions

diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-aarch64.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-aarch64.cfg
deleted file mode 100644
index 79b92b517..000000000
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-aarch64.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-config_opts['root'] = 'fedora-branched-pungi-aarch64'
-config_opts['target_arch'] = 'aarch64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://armpkgs.fedoraproject.org/mash/branched/aarch64/os
-
-[buildroot]
-name=buildroot
-baseurl=http://armpkgs.fedoraproject.org/repos/f23-build/latest/aarch64/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
deleted file mode 100644
index 9b370e261..000000000
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-config_opts['root'] = 'fedora-branched-pungi-armhfp'
-config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://kojipkgs.fedoraproject.org/mash/branched/armhfp/os
-
-[buildroot]
-name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/armhfp/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
deleted file mode 100644
index 5496dbb50..000000000
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-config_opts['root'] = 'fedora-branched-pungi-i386'
-config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os
-
-[buildroot]
-name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/i386/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64.cfg
deleted file mode 100644
index c0b66c8df..000000000
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-config_opts['root'] = 'fedora-branched-pungi-ppc64'
-config_opts['target_arch'] = 'ppc64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://ppcpkgs.fedoraproject.org/mash/branched/ppc64/os
-
-[buildroot]
-name=buildroot
-baseurl=http://ppcpkgs.fedoraproject.org/repos/f23-build/latest/ppc64/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64le.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64le.cfg
deleted file mode 100644
index c0b66c8df..000000000
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-ppc64le.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-config_opts['root'] = 'fedora-branched-pungi-ppc64'
-config_opts['target_arch'] = 'ppc64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://ppcpkgs.fedoraproject.org/mash/branched/ppc64/os
-
-[buildroot]
-name=buildroot
-baseurl=http://ppcpkgs.fedoraproject.org/repos/f23-build/latest/ppc64/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
deleted file mode 100644
index cb8c063ab..000000000
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-config_opts['root'] = 'fedora-branched-pungi-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-
-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
-# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
-# .i?86 packages except these.
-exclude=[!g]*.i*86 g[!l]*.i?86  gl[!i]*.i?86 gli[!b]*.i?86 glib[!c]*.i?86 
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os
-
-[buildroot]
-name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/x86_64/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-aarch64.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-aarch64.cfg
deleted file mode 100644
index 7188c9a04..000000000
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-aarch64.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-pungi-aarch64'
-config_opts['target_arch'] = 'aarch64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://armpkgs.fedoraproject.org/mash/rawhide/aarch64/os
-
-[buildroot]
-name=buildroot
-baseurl=http://armpkgs.fedoraproject.org/repos/f24-build/latest/aarch64/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg
deleted file mode 100644
index 52d6ac7cb..000000000
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-armhfp.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-pungi-armhfp'
-config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/armhfp/os
-
-[buildroot]
-name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f24-build/latest/armhfp/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg
deleted file mode 100644
index a378d0cf0..000000000
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-i386.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-pungi-i386'
-config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/i386/os
-
-[buildroot]
-name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f24-build/latest/i386/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64.cfg
deleted file mode 100644
index d058cd992..000000000
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-pungi-ppc64le'
-config_opts['target_arch'] = 'ppc64le'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://ppcpkgs.fedoraproject.org/mash/rawhide/ppc64le/os
-
-[buildroot]
-name=buildroot
-baseurl=http://ppcpkgs.fedoraproject.org/repos/f24-build/latest/ppc64le/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64le.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64le.cfg
deleted file mode 100644
index d058cd992..000000000
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-ppc64le.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-pungi-ppc64le'
-config_opts['target_arch'] = 'ppc64le'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-
-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
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://ppcpkgs.fedoraproject.org/mash/rawhide/ppc64le/os
-
-[buildroot]
-name=buildroot
-baseurl=http://ppcpkgs.fedoraproject.org/repos/f24-build/latest/ppc64le/
-"""
diff --git a/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg b/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg
deleted file mode 100644
index a64d31ab7..000000000
--- a/roles/koji_builder/files/builders/fedora-rawhide-pungi-x86_64.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-pungi-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['plugin_conf']['yum_cache_enable'] = False
-config_opts['plugin_conf']['ccache_enable'] = False
-
-
-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
-# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
-# .i?86 packages except these.
-exclude=[!g]*.i*86 g[!l]*.i?86  gl[!i]*.i?86 gli[!b]*.i?86 glib[!c]*.i?86 
-http_caching=none
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os
-
-[buildroot]
-name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f24-build/latest/x86_64/
-"""
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index dba0263e5..7f4366ddf 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -189,25 +189,6 @@
   tags:
   - koji_builder
 
-# mock configs for pungify job
-- name: put extra special  mock configs in
-  copy: src=builders/{{ item }} dest="/etc/mock/{{ item }}" mode=644
-  with_items:
-    - fedora-branched-pungi-armhfp.cfg
-    - fedora-branched-pungi-i386.cfg
-    - fedora-branched-pungi-x86_64.cfg
-    - fedora-branched-pungi-aarch64.cfg
-    - fedora-branched-pungi-ppc64.cfg
-    - fedora-branched-pungi-ppc64le.cfg
-    - fedora-rawhide-pungi-i386.cfg
-    - fedora-rawhide-pungi-x86_64.cfg
-    - fedora-rawhide-pungi-armhfp.cfg
-    - fedora-rawhide-pungi-aarch64.cfg
-    - fedora-rawhide-pungi-ppc64.cfg
-    - fedora-rawhide-pungi-ppc64le.cfg
-  tags:
-  - koji_builder
-
 - name: mock site-defaults.cfg
   template: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
   when: not inventory_hostname.startswith('bkernel')
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index 9c3edd149..11d173d17 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -115,41 +115,6 @@
 - name: /etc/koji.conf
   template: src=koji.conf.j2 dest=/etc/koji.conf.d/compose.conf
 
-# mock configs
-- name: put extra special  mock configs in
-  template: src="{{ item }}" dest="/etc/mock/{{ item }}" mode=644
-  with_items:
-    - fedora-22-compose-armhfp.cfg
-    - fedora-23-compose-armhfp.cfg
-    - fedora-24-compose-armhfp.cfg
-    - fedora-branched-compose-armhfp.cfg
-    - fedora-rawhide-compose-armhfp.cfg
-    - fedora-22-compose-i386.cfg
-    - fedora-23-compose-i386.cfg
-    - fedora-24-compose-i386.cfg
-    - fedora-branched-compose-i386.cfg
-    - fedora-rawhide-compose-i386.cfg
-    - fedora-22-compose-x86_64.cfg
-    - fedora-23-compose-x86_64.cfg
-    - fedora-24-compose-x86_64.cfg
-    - fedora-branched-compose-x86_64.cfg
-    - fedora-rawhide-compose-x86_64.cfg
-    - fedora-22-compose-aarch64.cfg
-    - fedora-23-compose-aarch64.cfg
-    - fedora-24-compose-aarch64.cfg
-    - fedora-branched-compose-aarch64.cfg
-    - fedora-rawhide-compose-aarch64.cfg
-    - fedora-22-compose-ppc64.cfg
-    - fedora-23-compose-ppc64.cfg
-    - fedora-24-compose-ppc64.cfg
-    - fedora-branched-compose-ppc64.cfg
-    - fedora-rawhide-compose-ppc64.cfg
-    - fedora-22-compose-ppc64le.cfg
-    - fedora-23-compose-ppc64le.cfg
-    - fedora-24-compose-ppc64le.cfg
-    - fedora-branched-compose-ppc64le.cfg
-    - fedora-rawhide-compose-ppc64le.cfg
-
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
   when: "'releng-compose' in group_names"
diff --git a/roles/releng/templates/fedora-22-compose-aarch64.cfg b/roles/releng/templates/fedora-22-compose-aarch64.cfg
deleted file mode 100644
index 7aba37850..000000000
--- a/roles/releng/templates/fedora-22-compose-aarch64.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-config_opts['root'] = 'fedora-22-compose-aarch64'
-config_opts['target_arch'] = 'aarch64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/22/Everything/aarch64/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/aarch64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-22-compose-armhfp.cfg b/roles/releng/templates/fedora-22-compose-armhfp.cfg
deleted file mode 100644
index fc64c2652..000000000
--- a/roles/releng/templates/fedora-22-compose-armhfp.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-config_opts['root'] = 'fedora-22-compose-armhfp'
-config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/22/Everything/armhfp/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/armhfp
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-22-compose-i386.cfg b/roles/releng/templates/fedora-22-compose-i386.cfg
deleted file mode 100644
index 3fabba9f5..000000000
--- a/roles/releng/templates/fedora-22-compose-i386.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-config_opts['root'] = 'fedora-22-compose-i386'
-config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/22/Everything/i386/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/i386
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-22-compose-ppc64.cfg b/roles/releng/templates/fedora-22-compose-ppc64.cfg
deleted file mode 100644
index a5d0531fb..000000000
--- a/roles/releng/templates/fedora-22-compose-ppc64.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-config_opts['root'] = 'fedora-22-compose-ppc64'
-config_opts['target_arch'] = 'ppc64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/22/Everything/ppc64/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/ppc64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-22-compose-ppc64le.cfg b/roles/releng/templates/fedora-22-compose-ppc64le.cfg
deleted file mode 100644
index 146ca1373..000000000
--- a/roles/releng/templates/fedora-22-compose-ppc64le.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-config_opts['root'] = 'fedora-22-compose-ppc64le'
-config_opts['target_arch'] = 'ppc64le'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/22/Everything/ppc64le/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/ppc64le
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-22-compose-x86_64.cfg b/roles/releng/templates/fedora-22-compose-x86_64.cfg
deleted file mode 100644
index 5ec931795..000000000
--- a/roles/releng/templates/fedora-22-compose-x86_64.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-config_opts['root'] = 'fedora-22-compose-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/22/Everything/x86_64/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/x86_64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-23-compose-aarch64.cfg b/roles/releng/templates/fedora-23-compose-aarch64.cfg
deleted file mode 100644
index 8a3f9842a..000000000
--- a/roles/releng/templates/fedora-23-compose-aarch64.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-config_opts['root'] = 'fedora-23-compose-aarch64'
-config_opts['target_arch'] = 'aarch64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/23/Everything/aarch64/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/aarch64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-23-compose-armhfp.cfg b/roles/releng/templates/fedora-23-compose-armhfp.cfg
deleted file mode 100644
index 7a903a283..000000000
--- a/roles/releng/templates/fedora-23-compose-armhfp.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-config_opts['root'] = 'fedora-23-compose-armhfp'
-config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/23/Everything/armhfp/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/armhfp
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-23-compose-i386.cfg b/roles/releng/templates/fedora-23-compose-i386.cfg
deleted file mode 100644
index 777d0145e..000000000
--- a/roles/releng/templates/fedora-23-compose-i386.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-config_opts['root'] = 'fedora-23-compose-i386'
-config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/23/Everything/i386/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/i386
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-23-compose-ppc64.cfg b/roles/releng/templates/fedora-23-compose-ppc64.cfg
deleted file mode 100644
index 01734157d..000000000
--- a/roles/releng/templates/fedora-23-compose-ppc64.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-config_opts['root'] = 'fedora-23-compose-ppc64'
-config_opts['target_arch'] = 'ppc64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/23/Everything/ppc64/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/ppc64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-23-compose-ppc64le.cfg b/roles/releng/templates/fedora-23-compose-ppc64le.cfg
deleted file mode 100644
index 85ef7a0bd..000000000
--- a/roles/releng/templates/fedora-23-compose-ppc64le.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-config_opts['root'] = 'fedora-23-compose-ppc64le'
-config_opts['target_arch'] = 'ppc64le'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/23/Everything/ppc64le/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/ppc64le
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-23-compose-x86_64.cfg b/roles/releng/templates/fedora-23-compose-x86_64.cfg
deleted file mode 100644
index cd8eb8c3b..000000000
--- a/roles/releng/templates/fedora-23-compose-x86_64.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-config_opts['root'] = 'fedora-23-compose-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = True
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/23/Everything/x86_64/os/
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/x86_64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-24-compose-aarch64.cfg b/roles/releng/templates/fedora-24-compose-aarch64.cfg
deleted file mode 100644
index d8ec81e05..000000000
--- a/roles/releng/templates/fedora-24-compose-aarch64.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-config_opts['root'] = 'fedora-24-compose-aarch64'
-config_opts['target_arch'] = 'aarch64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/aarch64/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/aarch64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-24-compose-armhfp.cfg b/roles/releng/templates/fedora-24-compose-armhfp.cfg
deleted file mode 100644
index 4bb91f1bc..000000000
--- a/roles/releng/templates/fedora-24-compose-armhfp.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-config_opts['root'] = 'fedora-24-compose-armhfp'
-config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/armhfp/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/armhfp
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-24-compose-i386.cfg b/roles/releng/templates/fedora-24-compose-i386.cfg
deleted file mode 100644
index 27c3b34da..000000000
--- a/roles/releng/templates/fedora-24-compose-i386.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-config_opts['root'] = 'fedora-24-compose-i386'
-config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/i386/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/i386
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-24-compose-ppc64.cfg b/roles/releng/templates/fedora-24-compose-ppc64.cfg
deleted file mode 100644
index dbcacda03..000000000
--- a/roles/releng/templates/fedora-24-compose-ppc64.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-config_opts['root'] = 'fedora-24-compose-ppc64'
-config_opts['target_arch'] = 'ppc64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/ppc64/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/ppc64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-24-compose-ppc64le.cfg b/roles/releng/templates/fedora-24-compose-ppc64le.cfg
deleted file mode 100644
index c9f3e23a4..000000000
--- a/roles/releng/templates/fedora-24-compose-ppc64le.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-config_opts['root'] = 'fedora-24-compose-ppc64le'
-config_opts['target_arch'] = 'ppc64le'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/ppc64le/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/ppc64le
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-24-compose-x86_64.cfg b/roles/releng/templates/fedora-24-compose-x86_64.cfg
deleted file mode 100644
index 551c01f50..000000000
--- a/roles/releng/templates/fedora-24-compose-x86_64.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-config_opts['root'] = 'fedora-24-compose-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/x86_64/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/x86_64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-branched-compose-aarch64.cfg b/roles/releng/templates/fedora-branched-compose-aarch64.cfg
deleted file mode 100644
index 5ab5667e2..000000000
--- a/roles/releng/templates/fedora-branched-compose-aarch64.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-config_opts['root'] = 'fedora-branched-compose-aarch64'
-config_opts['target_arch'] = 'aarch64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/aarch64/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/aarch64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-branched-compose-armhfp.cfg b/roles/releng/templates/fedora-branched-compose-armhfp.cfg
deleted file mode 100644
index 1284f421c..000000000
--- a/roles/releng/templates/fedora-branched-compose-armhfp.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-config_opts['root'] = 'fedora-branched-compose-armhfp'
-config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/armhfp/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/armhfp
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-branched-compose-i386.cfg b/roles/releng/templates/fedora-branched-compose-i386.cfg
deleted file mode 100644
index e104af755..000000000
--- a/roles/releng/templates/fedora-branched-compose-i386.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-config_opts['root'] = 'fedora-branched-compose-i386'
-config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/i386/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/i386
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-branched-compose-ppc64.cfg b/roles/releng/templates/fedora-branched-compose-ppc64.cfg
deleted file mode 100644
index 7d4e9f902..000000000
--- a/roles/releng/templates/fedora-branched-compose-ppc64.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-config_opts['root'] = 'fedora-branched-compose-ppc64'
-config_opts['target_arch'] = 'ppc64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/ppc64/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/ppc64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-branched-compose-ppc64le.cfg b/roles/releng/templates/fedora-branched-compose-ppc64le.cfg
deleted file mode 100644
index 1bd6d97cc..000000000
--- a/roles/releng/templates/fedora-branched-compose-ppc64le.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-config_opts['root'] = 'fedora-branched-compose-ppc64le'
-config_opts['target_arch'] = 'ppc64le'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/ppc64le/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/ppc64le
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-branched-compose-x86_64.cfg b/roles/releng/templates/fedora-branched-compose-x86_64.cfg
deleted file mode 100644
index 259310a84..000000000
--- a/roles/releng/templates/fedora-branched-compose-x86_64.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-config_opts['root'] = 'fedora-branched-compose-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/x86_64/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/x86_64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-rawhide-compose-aarch64.cfg b/roles/releng/templates/fedora-rawhide-compose-aarch64.cfg
deleted file mode 100644
index 4e2c5e864..000000000
--- a/roles/releng/templates/fedora-rawhide-compose-aarch64.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-compose-aarch64'
-config_opts['target_arch'] = 'aarch64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/rawhide/aarch64/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/rawhide/latest/aarch64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-rawhide-compose-armhfp.cfg b/roles/releng/templates/fedora-rawhide-compose-armhfp.cfg
deleted file mode 100644
index e7812f973..000000000
--- a/roles/releng/templates/fedora-rawhide-compose-armhfp.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-compose-armhfp'
-config_opts['target_arch'] = 'armv7hl'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi uboot-tools'
-config_opts['dist'] = 'fc21'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/rawhide/armhfp/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/rawhide/latest/armhfp
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-rawhide-compose-i386.cfg b/roles/releng/templates/fedora-rawhide-compose-i386.cfg
deleted file mode 100644
index 683801a68..000000000
--- a/roles/releng/templates/fedora-rawhide-compose-i386.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-compose-i386'
-config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/rawhide/i386/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/rawhide/latest/i386
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-rawhide-compose-ppc64.cfg b/roles/releng/templates/fedora-rawhide-compose-ppc64.cfg
deleted file mode 100644
index d4fc2ff33..000000000
--- a/roles/releng/templates/fedora-rawhide-compose-ppc64.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-compose-ppc64'
-config_opts['target_arch'] = 'ppc64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/rawhide/ppc64/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/rawhide/latest/ppc64
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-rawhide-compose-ppc64le.cfg b/roles/releng/templates/fedora-rawhide-compose-ppc64le.cfg
deleted file mode 100644
index 3e93f4106..000000000
--- a/roles/releng/templates/fedora-rawhide-compose-ppc64le.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-compose-ppc64le'
-config_opts['target_arch'] = 'ppc64le'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/rawhide/ppc64le/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/rawhide/latest/ppc64le
-enabled=1
-#cost=2000
-"""
diff --git a/roles/releng/templates/fedora-rawhide-compose-x86_64.cfg b/roles/releng/templates/fedora-rawhide-compose-x86_64.cfg
deleted file mode 100644
index 716d3ca09..000000000
--- a/roles/releng/templates/fedora-rawhide-compose-x86_64.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-config_opts['root'] = 'fedora-rawhide-compose-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
-config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/pungi', '/srv/pungi' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/fedora_koji', '/mnt/fedora_koji' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/pub/fedora', '/pub/fedora' ))
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=https://{{kojipkgs_url}}/mash/rawhide/x86_64/os
-enabled=1
-cost=5000
-
-[static]
-name=static
-baseurl=https://{{kojipkgs_url}}/repos/rawhide/latest/x86_64
-enabled=1
-#cost=2000
-"""