added fedora-25-ppc64le.cfg to COPR + updated gpgkey references to use distribution-gpg-key keys

4 files changed, 77 insertions, 7 deletions

diff --git a/roles/copr/backend/files/provision/files/mock/fedora-23-ppc64le.cfg b/roles/copr/backend/files/provision/files/mock/fedora-23-ppc64le.cfg
index 2f073f1fa..fb66e2672 100644
--- a/roles/copr/backend/files/provision/files/mock/fedora-23-ppc64le.cfg
+++ b/roles/copr/backend/files/provision/files/mock/fedora-23-ppc64le.cfg
@@ -28,17 +28,15 @@ mdpolicy=group:primary
 [fedora]
 name=fedora
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-#baseurl=https://dl.fedoraproject.org/pub/fedora-secondary/releases/23/Everything/ppc64le/
 failovermethod=priority
-gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-secondary
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-23-secondary
 gpgcheck=1
 
 [updates]
 name=updates
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#baseurl=https://dl.fedoraproject.org/pub/fedora-secondary/updates/23/Everything/ppc64le/
 failovermethod=priority
-gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-secondary
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-23-secondary
 gpgcheck=1
 
 [updates-testing]
diff --git a/roles/copr/backend/files/provision/files/mock/fedora-24-ppc64le.cfg b/roles/copr/backend/files/provision/files/mock/fedora-24-ppc64le.cfg
index 2d914619b..c43c06bfb 100644
--- a/roles/copr/backend/files/provision/files/mock/fedora-24-ppc64le.cfg
+++ b/roles/copr/backend/files/provision/files/mock/fedora-24-ppc64le.cfg
@@ -29,14 +29,14 @@ mdpolicy=group:primary
 name=fedora
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 failovermethod=priority
-gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-24-secondary
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-24-secondary
 gpgcheck=1
 
 [updates]
 name=updates
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 failovermethod=priority
-gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-24-secondary
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-24-secondary
 gpgcheck=1
 
 [updates-testing]
diff --git a/roles/copr/backend/files/provision/files/mock/fedora-25-ppc64le.cfg b/roles/copr/backend/files/provision/files/mock/fedora-25-ppc64le.cfg
new file mode 100644
index 000000000..3cca0c73b
--- /dev/null
+++ b/roles/copr/backend/files/provision/files/mock/fedora-25-ppc64le.cfg
@@ -0,0 +1,71 @@
+config_opts['root'] = 'fedora-25-ppc64le'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils fedora-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
+config_opts['dist'] = 'fc25'  # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '25'
+config_opts['package_manager'] = 'dnf'
+
+config_opts['yum.conf'] = """
+[main]
+keepcache=1
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+install_weak_deps=0
+metadata_expire=0
+mdpolicy=group:primary
+
+# repos
+
+[fedora]
+name=fedora
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+failovermethod=priority
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-25-secondary
+gpgcheck=1
+
+[updates]
+name=updates
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+failovermethod=priority
+gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-25-secondary
+gpgcheck=1
+
+[updates-testing]
+name=updates-testing
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+failovermethod=priority
+enabled=0
+
+[local]
+name=local
+baseurl=http://ppcpkgs.fedoraproject.org/repos/f25-build/latest/ppc64le/
+cost=2000
+enabled=0
+
+[fedora-debuginfo]
+name=fedora-debuginfo
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
+failovermethod=priority
+enabled=0
+
+[updates-debuginfo]
+name=updates-debuginfo
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
+failovermethod=priority
+enabled=0
+
+[updates-testing-debuginfo]
+name=updates-testing-debuginfo
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
+failovermethod=priority
+enabled=0
+"""
diff --git a/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml b/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml
index 405d22764..7f2a791ae 100644
--- a/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml
+++ b/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml
@@ -55,6 +55,7 @@
     - site-defaults.cfg
     - fedora-23-ppc64le.cfg
     - fedora-24-ppc64le.cfg
+    - fedora-25-ppc64le.cfg
     - fedora-rawhide-ppc64le.cfg
 
 # ansible doesn't support simultaneously usage of async and with_* options
@@ -62,7 +63,7 @@
 - name: prepare cache
   when: prepare_base_image is defined
   async: 14400
-  shell: "for i in fedora-23-ppc64le fedora-24-ppc64le fedora-rawhide-ppc64le; do mock --init -r $i; done"
+  shell: "for i in fedora-23-ppc64le fedora-24-ppc64le fedora-25-ppc64le fedora-rawhide-ppc64le; do mock --init -r $i; done"
 
 - name: mockbuilder user
   user: name=mockbuilder groups=mock